X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=memcached.spec;h=1fe5c48a49179ecccb01fdb901a4e22f71065ef9;hb=dacfa27336a56b0388e2779d16efed2b4ef3db22;hp=98e63b572c27c7294aba312486225bbee1366b10;hpb=245e901a342db60d829070bb9677771165c66874;p=packages%2Fmemcached.git

diff --git a/memcached.spec b/memcached.spec
index 98e63b5..1fe5c48 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -1,19 +1,31 @@
+# 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.1
+Version:	1.4.36
 Release:	1
 License:	BSD
 Group:		Networking/Daemons
-Source0:	http://memcached.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	fb1b7e9fcf47b95c5ad3bbeb76342088
+Source0:	http://www.memcached.org/files/%{name}-%{version}.tar.gz
+# Source0-md5:	1e028fbab7288911fcaa5ed2a21817fe
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-URL:		http://www.danga.com/memcached/
+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
@@ -26,38 +38,58 @@ 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
 
+sed -nie '1,/^$/p' ChangeLog
+
+%ifarch x32
+%{__sed} -i -e 's/-Werror//' configure.ac
+%endif
+
 %build
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+	%{?with_repcached:--enable-replication} \
 	--disable-coverage
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},/var/run/memcached}
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},/var/run/memcached} \
+	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-install memcached $RPM_BUILD_ROOT%{_sbindir}
-install doc/memcached.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%{__make} install \
+	INSTALL="%{__install} -p" \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+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}
@@ -80,9 +112,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README TODO 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}