diff --git a/redis-2.4.1.tar.gz b/redis-2.4.1.tar.gz deleted file mode 100644 index e524395..0000000 --- a/redis-2.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38e02d21f7a5137089f8513490a61efa51e1222e94cee1cb19246305444a0902 -size 618821 diff --git a/redis-2.4.15-linenoise-cflags.patch b/redis-2.4.15-linenoise-cflags.patch new file mode 100644 index 0000000..18a5548 --- /dev/null +++ b/redis-2.4.15-linenoise-cflags.patch @@ -0,0 +1,17 @@ +Index: deps/linenoise/Makefile +=================================================================== +--- deps/linenoise/Makefile.orig ++++ deps/linenoise/Makefile +@@ -1,10 +1,10 @@ + linenoise_example: linenoise.h linenoise.c + + linenoise_example: linenoise.o example.o +- $(CC) $(ARCH) -Wall -W -Os -g -o linenoise_example linenoise.o example.o ++ $(CC) $(ARCH) $(CFLAGS) -o linenoise_example linenoise.o example.o + + .c.o: +- $(CC) $(ARCH) -c -Wall -W -Os -g $< ++ $(CC) $(ARCH) -c $(CFLAGS) $< + + clean: + rm -f linenoise_example *.o diff --git a/redis-2.4.15.tar.gz b/redis-2.4.15.tar.gz new file mode 100644 index 0000000..61bb786 --- /dev/null +++ b/redis-2.4.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e5467079aa130d9e968dd7b35411940f012d322bf68d287c7af6f4d40e393c4 +size 653949 diff --git a/redis-endian.patch b/redis-endian.patch index 0a4a117..79aefe9 100644 --- a/redis-endian.patch +++ b/redis-endian.patch @@ -1,13 +1,13 @@ -Index: redis-2.4.1/src/Makefile +Index: src/Makefile =================================================================== ---- redis-2.4.1.orig/src/Makefile -+++ redis-2.4.1/src/Makefile -@@ -58,7 +58,7 @@ PREFIX= /usr/local +--- src/Makefile.orig ++++ src/Makefile +@@ -58,7 +58,7 @@ PREFIX?=/usr/local INSTALL_BIN= $(PREFIX)/bin - INSTALL= cp -p + INSTALL= cp -pf --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 ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o slowlog.o bio.o -+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 ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o slowlog.o bio.o endian.o +-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 ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o slowlog.o bio.o memtest.o ++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 ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o slowlog.o bio.o memtest.o endian.o BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o - CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o + CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o ae.o CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o diff --git a/redis.changes b/redis.changes index f3b1631..0175dac 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jul 23 18:11:50 UTC 2012 - mrueckert@suse.de + +- update to 2.4.15 + too many changes see + /usr/share/doc/packages/redis/00-RELEASENOTES +- added redis-2.4.15-linenoise-cflags.patch + make sure we build the dependency with cflags +- refreshed redis-endian.patch + ------------------------------------------------------------------- Fri Mar 23 13:35:46 UTC 2012 - dvaleev@suse.com diff --git a/redis.spec b/redis.spec index 851e650..adec4c0 100644 --- a/redis.spec +++ b/redis.spec @@ -20,7 +20,7 @@ %define _log_dir %{_localstatedir}/log/%{name} Name: redis -Version: 2.4.1 +Version: 2.4.15 Release: 0 Summary: Persistent key-value database License: BSD-3-Clause @@ -36,6 +36,7 @@ Patch1: %{name}-conf.patch # PATCH-FIX-UPSTREAM -- Fixed AOF: Server should have been started: Expected '1' to equal or match '0' Patch2: skip-aof-test.patch Patch3: redis-endian.patch +Patch4: redis-2.4.15-linenoise-cflags.patch # for make test BuildRequires: tcl Requires: logrotate @@ -54,10 +55,17 @@ different kind of sorting abilities. %patch0 %patch1 %patch2 -p1 -%patch3 -p1 +%patch3 -p0 +%patch4 -p0 %build -CFLAGS="%{optflags}" make %{?_smp_mflags} +# pushd deps/linenoise +# make CFLAGS="%{optflags}" +# popd +# pushd deps/hiredis +# make CFLAGS="%{optflags}" +# popd +make %{?_smp_mflags} CFLAGS="%{optflags}" V=1 %install install -d %{buildroot}%{_log_dir} %{buildroot}%{_data_dir} @@ -111,7 +119,7 @@ echo " sudo rcredis start; sudo insserv redis" %files %defattr(-,root,root,-) -%doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING Changelog README TODO +%doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING README %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_bindir}/redis-* %{_sbindir}/redis-*