Explorar el Código

upgrading package: redis 2.2.11 -> 2.2.12

Ralf S. Engelschall hace 14 años
padre
commit
fd7d3700c2
Se han modificado 2 ficheros con 28 adiciones y 27 borrados
  1. 25 24
      redis/redis.patch
  2. 3 3
      redis/redis.spec

+ 25 - 24
redis/redis.patch

@@ -1,9 +1,9 @@
 Index: src/Makefile
---- src/Makefile.orig	2011-01-17 12:21:59.000000000 +0100
-+++ src/Makefile	2011-01-18 08:35:37.000000000 +0100
-@@ -6,12 +6,12 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
+--- src/Makefile.orig	2011-07-22 12:22:26.000000000 +0200
++++ src/Makefile	2011-07-23 18:45:44.000000000 +0200
+@@ -19,12 +19,12 @@
+ endif
+ 
  ifeq ($(uname_S),SunOS)
 -  CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
 -  CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
@@ -18,7 +18,7 @@ Index: src/Makefile
    DEBUG?= -g -rdynamic -ggdb 
  endif
  
-@@ -19,7 +19,7 @@
+@@ -32,7 +32,7 @@
    CCLINK+= -ltcmalloc
    CFLAGS+= -DUSE_TCMALLOC
  endif
@@ -27,39 +27,40 @@ Index: src/Makefile
  
  PREFIX= /usr/local
  INSTALL_BIN= $(PREFIX)/bin
-@@ -111,26 +111,26 @@
+@@ -130,27 +130,27 @@
  	cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)"
  
  redis-server: $(OBJ)
--	$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
-+	$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(LIBS)
+-	$(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ)
++	$(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(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)
+ 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR)
+ 	cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)"
+-	$(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a
++	$(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a $(LIBS)
  
  redis-benchmark.o:
- 	$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $<
+ 	$(QUIET_CC)$(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)
+-	$(QUIET_LINK)$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o
++	$(QUIET_LINK)$(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(LIBS)
  
  redis-cli.o:
- 	$(CC) -c $(CFLAGS) -I../deps/hiredis -I../deps/linenoise $(DEBUG) $(COMPILE_TIME) $<
+ 	$(QUIET_CC)$(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) $(LIBS)
+-	$(QUIET_LINK)$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
++	$(QUIET_LINK)$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ) $(LIBS)
  
  redis-check-aof: $(CHECKAOFOBJ)
--	$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ)
-+	$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) $(LIBS)
+-	$(QUIET_LINK)$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ)
++	$(QUIET_LINK)$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) $(LIBS)
  
  .c.o:
- 	$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
-@@ -148,7 +148,7 @@
+ 	$(QUIET_CC)$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
+@@ -168,7 +168,7 @@
  	./redis-benchmark
  
  log:
@@ -69,8 +70,8 @@ Index: src/Makefile
  32bit:
  	@echo ""
 Index: src/mkreleasehdr.sh
---- src/mkreleasehdr.sh.orig	2011-01-17 12:21:59.000000000 +0100
-+++ src/mkreleasehdr.sh	2011-01-18 08:35:37.000000000 +0100
+--- src/mkreleasehdr.sh.orig	2011-07-22 12:22:26.000000000 +0200
++++ src/mkreleasehdr.sh	2011-07-23 18:42:06.000000000 +0200
 @@ -1,6 +1,6 @@
  #!/bin/sh
  GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`

+ 3 - 3
redis/redis.spec

@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_opkg 2.2.11
-%define       V_dist 2.2.11
+%define       V_opkg 2.2.12
+%define       V_dist 2.2.12
 
 #   package information
 Name:         redis
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Database
 License:      BSD
 Version:      %{V_opkg}
-Release:      20110624
+Release:      20110723
 
 #   list of sources
 Source0:      http://redis.googlecode.com/files/redis-%{V_dist}.tar.gz