Accepting request 110823 from server:database

- fix ppc and ppc64 build.
  disable tests for powerpc for now (forwarded request 110819 from k0da)

OBS-URL: https://build.opensuse.org/request/show/110823
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/redis?expand=0&rev=3

redis-endian.patch

@@ -0,0 +1,13 @@
+Index: redis-2.4.1/src/Makefile
+===================================================================
+--- redis-2.4.1.orig/src/Makefile
++++ redis-2.4.1/src/Makefile
+@@ -58,7 +58,7 @@ PREFIX= /usr/local
+ INSTALL_BIN= $(PREFIX)/bin
+ INSTALL= cp -p
+ 
+-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
+ 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
+ CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o

redis.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 23 13:35:46 UTC 2012 - dvaleev@suse.com
+
+- fix ppc and ppc64 build.
+  disable tests for powerpc for now
+
 -------------------------------------------------------------------
 Thu Nov 24 09:56:41 UTC 2011 - saschpe@suse.de
 

redis.spec

@@ -1,5 +1,7 @@
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# spec file for package redis
+#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -9,7 +11,7 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-#
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -20,10 +22,10 @@
 Name:           redis
 Version:        2.4.1
 Release:        0
-License:        BSD-3-Clause
 Summary:        Persistent key-value database
-Url:            http://redis.io/
+License:        BSD-3-Clause
 Group:          Productivity/Databases/Servers
+Url:            http://redis.io/
 Source:         http://redis.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:        %{name}.logrotate
 Source4:        redis.sysconfig
@@ -33,6 +35,7 @@ Patch0:         %{name}-initscript.patch
 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
 # for make test
 BuildRequires:  tcl
 Requires:       logrotate
@@ -51,6 +54,7 @@ different kind of sorting abilities.
 %patch0
 %patch1
 %patch2 -p1
+%patch3 -p1
 
 %build
 CFLAGS="%{optflags}" make %{?_smp_mflags}
@@ -78,6 +82,7 @@ ln -s %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 %check
+%ifnarch ppc ppc64
 cat <<EOF
 ---------------------------------------------------
 The test suite often fails to start a server, with
@@ -85,6 +90,7 @@ The test suite often fails to start a server, with
 ---------------------------------------------------
 EOF
 make test && true
+%endif
 
 %pre
 /usr/sbin/groupadd -r %{name} &>/dev/null || :