patch to make arm arch check more consistent

[packages/redis.git] / redis.spec

diff --git a/redis.spec b/redis.spec
index 4e45910d2d5d7882b59c5ea5789828f7d225537f..3ee5a25755a9fa4abcb8e018d59ee757f532d523 100644 (file)
--- a/redis.spec
+++ b/redis.spec
@@ -13,20 +13,25 @@
 
 Summary:       A persistent key-value database
 Name:          redis
-Version:       4.0.11
+Version:       6.2.5
 Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       http://download.redis.io/releases/%{name}-%{version}.tar.gz
-# Source0-md5: e62d3793f86a6a0021609c9f905cb960
+# Source0-md5: db8a2b45eafbf1ead4353044fb70f581
 Source1:       %{name}.logrotate
 Source2:       %{name}.init
 Source3:       %{name}.tmpfiles
 Patch0:                %{name}.conf.patch
 Patch1:                %{name}-tcl.patch
+Patch2:                0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
+Patch3:                arm-arch-check.patch
 URL:           http://www.redis.io/
 %{?with_perftools:BuildRequires:    gperftools-devel}
 BuildRequires: jemalloc-static
+%ifarch %{arm}
+BuildRequires: libatomic-devel
+%endif
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.202
 BuildRequires: sed >= 4.0
@@ -72,6 +77,8 @@ disk.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 # Remove integration tests
 %{__sed} -i -e '/    integration\/replication/d' tests/test_helper.tcl
@@ -89,7 +96,7 @@ ln -s %{_includedir} deps/jemalloc/include
 
 %build
 %define specflags -std=c99 -pedantic
-%define _make_opts CC="%{__cc}" CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" OPTIMIZATION="" DEBUG="" V=1
+%define _make_opts CC="%{__cc}" CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" OPTIMIZATION="" DEBUG="" V=1 uname_M=%{_target_cpu}
 
 %{__make} -C src all
 
@@ -102,7 +109,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir}} \
        $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d} \
        $RPM_BUILD_ROOT%{_localstatedir}/{{lib,log,run}/%{name},log/archive/%{name}} \
-       $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+       $RPM_BUILD_ROOT%{systemdtmpfilesdir} \
+       $RPM_BUILD_ROOT%{_mandir}/man{1,5}
 
 %{__make} install \
        INSTALL="install -p" \
@@ -121,6 +129,18 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 cp -p %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
+# man-pages
+for man in man/man1/*; do
+       install $man $RPM_BUILD_ROOT%{_mandir}/man1
+done
+for man in man/man5/*; do
+       install $man $RPM_BUILD_ROOT%{_mandir}/man5
+done
+
+# sentinel can be symlinked
+echo ".so man1/redis-server.1" > $RPM_BUILD_ROOT%{_mandir}/man1/redis-sentinel.1
+echo ".so man5/redis.conf.5" > $RPM_BUILD_ROOT%{_mandir}/man5/redis-sentinel.conf.5
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -148,9 +168,9 @@ fi
 %defattr(644,root,root,755)
 %doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING INSTALL MANIFESTO README.md
 %attr(755,root,root) %{_bindir}/redis-benchmark
-%attr(755,root,root) %{_bindir}/redis-check-aof
-%attr(755,root,root) %{_bindir}/redis-check-rdb
 %attr(755,root,root) %{_bindir}/redis-cli
+%{_mandir}/man1/redis-benchmark.1*
+%{_mandir}/man1/redis-cli.1*
 
 %files server
 %defattr(644,root,root,755)
@@ -158,9 +178,17 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/redis-sentinel
 %attr(755,root,root) %{_sbindir}/redis-server
+%attr(755,root,root) %{_bindir}/redis-check-aof
+%attr(755,root,root) %{_bindir}/redis-check-rdb
 %config(noreplace) /etc/logrotate.d/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/lib/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/log/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/log/archive/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/run/%{name}
 %{systemdtmpfilesdir}/%{name}.conf
+%{_mandir}/man1/redis-sentinel.1*
+%{_mandir}/man1/redis-server.1*
+%{_mandir}/man1/redis-check-aof.1*
+%{_mandir}/man1/redis-check-rdb.1*
+%{_mandir}/man5/redis.conf.5*
+%{_mandir}/man5/redis-sentinel.conf.5*