Author: glen Date: Sun Feb 26 11:40:12 2012 GMT Module: packages Tag: HEAD ---- Log message: - add tmpfiles.d
---- Files affected: packages/couchdb: couchdb.spec (1.6 -> 1.7) , couchdb.tmpfiles (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/couchdb/couchdb.spec diff -u packages/couchdb/couchdb.spec:1.6 packages/couchdb/couchdb.spec:1.7 --- packages/couchdb/couchdb.spec:1.6 Sun Feb 26 12:22:02 2012 +++ packages/couchdb/couchdb.spec Sun Feb 26 12:40:06 2012 @@ -21,6 +21,7 @@ Source0: http://www.apache.org/dist/couchdb/%{version}/apache-%{name}-%{version}.tar.gz # Source0-md5: 001cf286b72492617e9ffba271702a00 Source1: %{name}.init +Source2: %{name}.tmpfiles URL: http://couchdb.apache.org/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.6.3 @@ -33,7 +34,7 @@ BuildRequires: libtool BuildRequires: pakchois-devel BuildRequires: pkgconfig -BuildRequires: rpmbuild(macros) >= 1.228 +BuildRequires: rpmbuild(macros) >= 1.647 Requires(post,preun): /sbin/chkconfig Requires(pre): /bin/id Requires(pre): /usr/bin/getgid @@ -44,8 +45,6 @@ Provides: user(couchdb) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define no_install_post_check_tmpfiles 1 - %description Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database accessible via a RESTful HTTP/JSON API. @@ -85,9 +84,12 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb $RPM_BUILD_ROOT/etc/sysconfig -mv $RPM_BUILD_ROOT/etc/rc.d/{,init.d}/%{name} +%{__rm} $RPM_BUILD_ROOT/etc/rc.d/%{name} install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} +install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf + %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name} %clean @@ -124,6 +126,7 @@ %attr(754,root,root) /etc/rc.d/init.d/%{name} %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} +%{systemdtmpfilesdir}/couchdb.conf # XXX: sbindir? %attr(755,root,root) %{_bindir}/couchdb @@ -179,12 +182,17 @@ %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/couchdb %attr(700,couchdb,couchdb) %dir %{_localstatedir}/log/couchdb +%attr(755,couchdb,root) %dir /var/run/couchdb + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <feedb...@pld-linux.org> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2012/02/26 11:40:06 glen +- add tmpfiles.d + Revision 1.6 2012/02/26 11:22:02 glen - merge with apache-couchdb.spec ================================================================ Index: packages/couchdb/couchdb.tmpfiles diff -u /dev/null packages/couchdb/couchdb.tmpfiles:1.1 --- /dev/null Sun Feb 26 12:40:12 2012 +++ packages/couchdb/couchdb.tmpfiles Sun Feb 26 12:40:06 2012 @@ -0,0 +1 @@ +d /var/run/couchdb 0755 couchdb root ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit