upgrading package: redis 2.0.4 -> 2.2.0rc2

redis/redis.patch

@@ -1,7 +1,7 @@
-Index: Makefile
---- Makefile.orig	2010-05-21 14:51:53.000000000 +0200
-+++ Makefile	2010-05-22 09:51:16.000000000 +0200
-@@ -6,14 +6,14 @@
+Index: src/Makefile
+--- src/Makefile.orig	2010-12-20 13:34:07.000000000 +0100
++++ src/Makefile	2010-12-21 09:06:18.000000000 +0100
+@@ -6,19 +6,19 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  OPTIMIZATION?=-O2
  ifeq ($(uname_S),SunOS)
@@ -15,32 +15,67 @@ Index: Makefile
 +  CFLAGS?= -std=c99 $(OPTIMIZATION) $(ARCH) $(PROF)
 +  LIBS?= -lm -pthread
  endif
+ 
+ ifeq ($(USE_TCMALLOC),yes)
+   CCLINK+= -ltcmalloc
+   CFLAGS+= -DUSE_TCMALLOC
+ endif
 -CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
 -DEBUG?= -g -rdynamic -ggdb 
 +CCOPT= $(CFLAGS) $(ARCH) $(PROF)
-+DEBUG?=
++DEBUG?= 
  
- OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o
- BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o
-@@ -56,7 +56,7 @@
- zmalloc.o: zmalloc.c config.h
+ PREFIX= /usr/local
+ INSTALL_BIN= $(PREFIX)/bin
+@@ -110,26 +110,26 @@
+ 	cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
  
  redis-server: $(OBJ)
 -	$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
 +	$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(LIBS)
- 	@echo ""
- 	@echo "Hint: To run the test-redis.tcl script is a good idea."
- 	@echo "Launch the redis server with ./redis-server, then in another"
-@@ -64,10 +64,10 @@
- 	@echo ""
  
- redis-benchmark: $(BENCHOBJ)
--	$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ)
-+	$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) $(LIBS)
+ redis-benchmark: dependencies $(BENCHOBJ)
+ 	cd ../deps/hiredis && $(MAKE) static
+-	$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a
++	$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a $(LIBS)
+ 
+ redis-benchmark.o:
+ 	$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
+ 
+ redis-cli: dependencies $(CLIOBJ)
+-	$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
++	$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(LIBS)
  
- redis-cli: $(CLIOBJ)
--	$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
-+	$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) $(LIBS)
+ redis-cli.o:
+ 	$(CC) -c $(CFLAGS) -I../deps/hiredis -I../deps/linenoise $(DEBUG) $(COMPILE_TIME) $<
  
  redis-check-dump: $(CHECKDUMPOBJ)
- 	$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
+-	$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
++	$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ) $(LIBS)
+ 
+ redis-check-aof: $(CHECKAOFOBJ)
+-	$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ)
++	$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) $(LIBS)
+ 
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
+@@ -147,7 +147,7 @@
+ 	./redis-benchmark
+ 
+ log:
+-	git log '--pretty=format:%ad %s (%cn)' --date=short > ../Changelog
++	cat /dev/null > ../Changelog
+ 
+ 32bit:
+ 	@echo ""
+Index: src/mkreleasehdr.sh
+--- src/mkreleasehdr.sh.orig	2010-12-20 13:34:07.000000000 +0100
++++ src/mkreleasehdr.sh	2010-12-21 09:07:29.000000000 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
+-GIT_DIRTY=`git diff 2> /dev/null | wc -l`
++GIT_DIRTY=`(git diff 2> /dev/null) | wc -l`
+ test -f release.h || touch release.h
+ (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
+ (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate

redis/redis.spec

@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_opkg 2.0.4
-%define       V_dist 2.0.4
+%define       V_opkg 2.2.0rc2
+%define       V_dist 2.2.0-rc2
 
 #   package information
 Name:         redis
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Database
 License:      BSD
 Version:      %{V_opkg}
-Release:      20101106
+Release:      20101221
 
 #   list of sources
 Source0:      http://redis.googlecode.com/files/redis-%{V_dist}.tar.gz
@@ -71,7 +71,7 @@ PreReq:       OpenPKG, openpkg >= 20100101
 %build
     %{l_shtool} subst \
         -e 's;/var/run/redis\.pid;%{l_prefix}/var/redis/run/redis.pid;' \
-        redis.c
+        src/redis.c
     %{l_make} %{l_mflags -O} \
         CC="%{l_cc} %{l_cflags -O}"
 
@@ -84,7 +84,7 @@ PreReq:       OpenPKG, openpkg >= 20100101
         $RPM_BUILD_ROOT%{l_prefix}/var/redis/log \
         $RPM_BUILD_ROOT%{l_prefix}/var/redis/db
     %{l_shtool} install -c -s -m 755 \
-        redis-server redis-cli redis-benchmark \
+        src/redis-server src/redis-cli src/redis-benchmark \
         $RPM_BUILD_ROOT%{l_prefix}/bin/
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
         %{SOURCE rc.redis} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/