Browse Source

upgrading package: redis 2.4.17 -> 2.6.0

Ralf S. Engelschall 13 years ago
parent
commit
b8f3b4d89d
2 changed files with 16 additions and 28 deletions
  1. 13 25
      redis/redis.patch
  2. 3 3
      redis/redis.spec

+ 13 - 25
redis/redis.patch

@@ -1,32 +1,20 @@
 Index: src/Makefile
---- src/Makefile.orig	2011-11-28 11:22:08.000000000 +0100
-+++ src/Makefile	2011-11-28 19:42:28.000000000 +0100
-@@ -25,11 +25,11 @@
- endif
+--- src/Makefile.orig	2012-10-22 23:27:18.000000000 +0200
++++ src/Makefile	2012-10-23 19:43:06.000000000 +0200
+@@ -18,8 +18,8 @@
+ DEPENDENCY_TARGETS=hiredis linenoise lua
  
- ifeq ($(uname_S),SunOS)
--  CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
-+  CFLAGS?=-std=c99 $(OPTIMIZATION) -D__EXTENSIONS__ -D_XPG6
-   CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
-   DEBUG?=-g -ggdb
- else
--  CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
-+  CFLAGS?=-std=c99 $(OPTIMIZATION) $(ARCH) $(PROF)
-   CCLINK?=-lm -pthread
-   DEBUG?=-g -rdynamic -ggdb
- endif
-@@ -205,7 +205,7 @@
- 	./redis-benchmark
+ # Default settings
+-STD= -std=c99 -pedantic
+-WARN= -Wall
++STD= -std=c99
++WARN=
+ OPT= $(OPTIMIZATION)
  
- log:
--	git log '--pretty=format:%ad %s (%cn)' --date=short > ../Changelog
-+	cat /dev/null > ../Changelog
- 
- 32bit:
- 	@echo ""
+ # Default allocator
 Index: src/mkreleasehdr.sh
---- src/mkreleasehdr.sh.orig	2011-11-28 11:22:08.000000000 +0100
-+++ src/mkreleasehdr.sh	2011-11-28 19:42:28.000000000 +0100
+--- src/mkreleasehdr.sh.orig	2012-10-22 23:27:18.000000000 +0200
++++ src/mkreleasehdr.sh	2012-10-23 19:21:58.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.4.17
-%define       V_dist 2.4.17
+%define       V_opkg 2.6.0
+%define       V_dist 2.6.0
 
 #   package information
 Name:         redis
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Database
 License:      BSD
 Version:      %{V_opkg}
-Release:      20120831
+Release:      20121023
 
 #   list of sources
 Source0:      http://redis.googlecode.com/files/redis-%{V_dist}.tar.gz