- up to 1.5.6

[packages/memcached.git] / memcached.spec

diff --git a/memcached.spec b/memcached.spec
index 7295d6c6be9a603231ae64abb8311a8cb1e979aa..0c10cac9a121890a564f2f63f964dfda647ad974 100644 (file)
--- a/memcached.spec
+++ b/memcached.spec
@@ -1,24 +1,31 @@
-#
-# Conditional build:
-%bcond_with            repcached               # repcached support, http://repcached.lab.klab.org/
+# NOTE
+# - release notes: https://github.com/memcached/memcached/wiki/ReleaseNotes
+# TODO
+# - fix x32 build failure:
+#crawler.c: In function 'crawler_metadump_eval':
+#crawler.c:229:13: warning: format '%ld' expects argument of type 'long int', but argument 5 has type 'time_t {aka long long int}' [-Wformat=]
+#             "key=%s exp=%ld la=%llu cas=%llu fetch=%s\n",
+#             ^
+#crawler.c:229:13: warning: format '%ld' expects argument of type 'long int', but argument 5 has type 'time_t {aka long long int}' [-Wformat=]
 
 Summary:       A high-performance, distributed memory object caching system
 Summary(pl.UTF-8):     Rozproszony, wysokiej wydajności system cache'owania obiektów
 Name:          memcached
-Version:       1.4.11
+Version:       1.5.6
 Release:       1
 License:       BSD
 Group:         Networking/Daemons
-Source0:       http://memcached.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 50ee313639531d4d2f8eb9c688f58948
+Source0:       http://www.memcached.org/files/%{name}-%{version}.tar.gz
+# Source0-md5: c795b34a5ed02305f9ecfeb747e5e1f7
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
-URL:           http://memcached.org/
-Patch0:                repcached.patch
+Source3:       %{name}.tmpfiles
+URL:           https://memcached.org/about
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libevent-devel >= 1.1
 BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: sed >= 4.0
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -31,15 +38,31 @@ Provides:   group(memcached)
 Provides:      user(memcached)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _bindir %{_sbindir}
+
 %description
 A high-performance, distributed memory object caching system.
 
 %description -l pl.UTF-8
 Rozproszony, wysokiej wydajności system cache'owania obiektów.
 
+%package devel
+Summary:       Files needed for development using memcached protocol
+Group:         Development/Libraries
+# does not require base
+
+%description devel
+Install memcached-devel if you are developing C/C++ applications that
+require access to the memcached binary include files.
+
 %prep
 %setup -q
-%{?with_repcached:%patch0 -p1}
+
+sed -nie '1,/^$/p' ChangeLog
+
+%ifarch x32
+%{__sed} -i -e 's/-Werror//' configure.ac
+%endif
 
 %build
 %{__aclocal}
@@ -54,17 +77,19 @@ Rozproszony, wysokiej wydajności system cache'owania obiektów.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},/var/run/memcached} \
-       $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man1}
+       $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-install -p memcached $RPM_BUILD_ROOT%{_sbindir}
-cp -p doc/memcached.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%{__make} install \
+       INSTALL="%{__install} -p" \
+       DESTDIR=$RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 %pre
 %groupadd -g 209 %{name}
-%useradd -u 209 -d /usr/share/empty -g %{name} -c "Memcached User" %{name}
+%useradd -u 209 -d /usr/share/empty -g %{name} -c "Memcached Daemon" %{name}
 
 %post
 /sbin/chkconfig --add %{name}
@@ -87,9 +112,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README doc/*.txt
+%doc AUTHORS README.md ChangeLog doc/*.txt
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/%{name}
 %{_mandir}/man1/memcached.1*
 %dir %attr(770,root,memcached) /var/run/memcached
+%{systemdtmpfilesdir}/%{name}.conf
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/%{name}