packages: rc-scripts/rc-scripts.spec, red5/red5.spec, redis/redis.spec, smo...

baggins baggins at pld-linux.org
Tue Jan 31 12:32:12 CET 2012 

Author: baggins                      Date: Tue Jan 31 11:32:12 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added tmpfiles config for systemd

---- Files affected:
packages/rc-scripts:
   rc-scripts.spec (1.382 -> 1.383) 
packages/red5:
   red5.spec (1.28 -> 1.29) 
packages/redis:
   redis.spec (1.15 -> 1.16) 
packages/smokeping:
   smokeping.spec (1.73 -> 1.74) 
packages/smtp-gated:
   smtp-gated.spec (1.35 -> 1.36) 
packages/socat:
   socat.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.382 packages/rc-scripts/rc-scripts.spec:1.383
--- packages/rc-scripts/rc-scripts.spec:1.382	Wed Jan 25 10:55:00 2012
+++ packages/rc-scripts/rc-scripts.spec	Tue Jan 31 12:32:07 2012
@@ -18,6 +18,7 @@
 # Source0-md5:	bf27c7699c48598293e166eae364a5e0
 Source1:	rc-scripts-systemd-tmpfiles.d.conf
 Source2:	rc-local.service
+Source3:	%{name}.tmpfiles
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 Patch0:		%{name}-svn.patch
 Patch1:		%{name}-skip_networkmanager_users_config.patch
@@ -138,8 +139,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/var/{run/netreport,log}
-install -d $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles
+install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \
+	$RPM_BUILD_ROOT/etc/sysconfig/hwprofiles \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -191,6 +193,7 @@
 # systemd
 install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/rc-scripts.conf
 install -D %{SOURCE2} $RPM_BUILD_ROOT/lib/systemd/system/rc-local.service
+install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 %if "%{pld_release}" == "ac"
 rm -rf $RPM_BUILD_ROOT/etc/init
@@ -357,6 +360,7 @@
 
 %attr(640,root,root) %ghost /var/log/dmesg
 %attr(750,root,root) %dir /var/run/netreport
+/usr/lib/tmpfiles.d/%{name}.conf
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/crypttab
@@ -394,6 +398,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.383  2012/01/31 11:32:07  baggins
+- added tmpfiles config for systemd
+
 Revision 1.382  2012/01/25 09:55:00  cactus
 - rel 4; add skip_networkmanager_users_config.patch
 

================================================================
Index: packages/red5/red5.spec
diff -u packages/red5/red5.spec:1.28 packages/red5/red5.spec:1.29
--- packages/red5/red5.spec:1.28	Tue Nov 16 21:20:24 2010
+++ packages/red5/red5.spec	Tue Jan 31 12:32:08 2012
@@ -16,6 +16,7 @@
 Source1:	%{name}
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
+Source4:	%{name}.tmpfiles
 URL:		http://red5.org/
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -79,8 +80,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appdatadir},%{_sbindir},%{_appstatedir}/work,%{_appconfdir},%{_applogdir}}
-install -d $RPM_BUILD_ROOT{/etc/sysconfig,/etc/rc.d/init.d,/var/run/red5}
+install -d $RPM_BUILD_ROOT{%{_appdatadir},%{_sbindir},%{_appstatedir}/work,%{_appconfdir},%{_applogdir}} \
+	$RPM_BUILD_ROOT{/etc/sysconfig,/etc/rc.d/init.d,/var/run/red5} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 cp -a {red5.jar,boot.jar,lib} $RPM_BUILD_ROOT%{_appdatadir}
 cp -a webapps $RPM_BUILD_ROOT%{_appstatedir}
@@ -94,6 +96,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/red5
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/red5
+install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -140,6 +143,7 @@
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(770,root,red5) /var/run/%{name}
+/usr/lib/tmpfiles.d/%{name}.conf
 %attr(755,root,root) %{_sbindir}/%{name}
 
 %files javadoc
@@ -153,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2012/01/31 11:32:08  baggins
+- added tmpfiles config for systemd
+
 Revision 1.28  2010/11/16 20:20:24  glen
 - java-eclipse-jdt rename
 

================================================================
Index: packages/redis/redis.spec
diff -u packages/redis/redis.spec:1.15 packages/redis/redis.spec:1.16
--- packages/redis/redis.spec:1.15	Fri Jan 20 14:36:46 2012
+++ packages/redis/redis.spec	Tue Jan 31 12:32:09 2012
@@ -28,6 +28,7 @@
 # Source0-md5:	c4b0b5e4953a11a503cb54cf6b09670e
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
+Source3:	%{name}.tmpfiles
 Patch0:		%{name}.conf.patch
 %{?with_perftools:BuildRequires:    google-perftools-devel}
 BuildRequires:	jemalloc-static
@@ -100,7 +101,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
+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/usr/lib/tmpfiles.d
+
 %{__make} install \
 	PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
@@ -108,15 +113,14 @@
 chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name}-*
 
 # Ensure redis-server location doesn't change
-install -d $RPM_BUILD_ROOT%{_sbindir}
 mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/%{name}-server
 
 # Install misc other
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 cp -p %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install -d $RPM_BUILD_ROOT%{_localstatedir}/{{lib,log,run}/%{name},log/archive/%{name}}
+
+install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -159,6 +163,7 @@
 %dir %attr(755,redis,root) %{_localstatedir}/log/%{name}
 %dir %{_localstatedir}/log/archive/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/run/%{name}
+/usr/lib/tmpfiles.d/%{name}.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -166,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2012/01/31 11:32:09  baggins
+- added tmpfiles config for systemd
+
 Revision 1.15  2012/01/20 13:36:46  baggins
 - rel 2
 - logrotate 3.8.0 requires "su" option for non-root owned dirs

================================================================
Index: packages/smokeping/smokeping.spec
diff -u packages/smokeping/smokeping.spec:1.73 packages/smokeping/smokeping.spec:1.74
--- packages/smokeping/smokeping.spec:1.73	Sat Jan  2 23:07:41 2010
+++ packages/smokeping/smokeping.spec	Tue Jan 31 12:32:10 2012
@@ -13,6 +13,7 @@
 Source2:	%{name}.conf
 Source3:	%{name}-config
 Source4:	%{name}-lighttpd.conf
+Source5:	%{name}.tmpfiles
 URL:		http://oss.oetiker.ch/smokeping/
 BuildRequires:	perl-tools-pod
 BuildRequires:	rpm-perlprov >= 4.1-13
@@ -114,7 +115,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir},%{_wwwconfdir},%{_sbindir}} \
 	$RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sharedstatedir}/%{name}/{img,rrd},%{_cgi_bindir}} \
-	$RPM_BUILD_ROOT{%{_mandir}/man{1,3,5,7},/var/run/%{name}}
+	$RPM_BUILD_ROOT{%{_mandir}/man{1,3,5,7},/var/run/%{name}} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 install etc/basepage.html.dist $RPM_BUILD_ROOT%{_sysconfdir}/basepage.html
 install etc/config.dist $RPM_BUILD_ROOT%{_sysconfdir}
@@ -138,6 +140,8 @@
 install doc/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install doc/*.7 $RPM_BUILD_ROOT%{_mandir}/man7
 
+install %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -227,6 +231,7 @@
 %dir %attr(775,root,smokeping) %{_sharedstatedir}/%{name}/rrd
 %dir %attr(775,root,http) %{_sharedstatedir}/%{name}/img
 %dir %attr(770,root,smokeping) /var/run/%{name}
+/usr/lib/tmpfiles.d/%{name}.conf
 
 %files cgi
 %defattr(644,root,root,755)
@@ -247,6 +252,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2012/01/31 11:32:10  baggins
+- added tmpfiles config for systemd
+
 Revision 1.73  2010/01/02 22:07:41  pawelz
 - noautoreq perl(Smokeping)
 - rel 9

================================================================
Index: packages/smtp-gated/smtp-gated.spec
diff -u packages/smtp-gated/smtp-gated.spec:1.35 packages/smtp-gated/smtp-gated.spec:1.36
--- packages/smtp-gated/smtp-gated.spec:1.35	Fri Aug 19 22:13:35 2011
+++ packages/smtp-gated/smtp-gated.spec	Tue Jan 31 12:32:11 2012
@@ -10,6 +10,7 @@
 # Source0-md5:	1026f1cc926d4448a1e47e805c78e085
 Source1:	%{name}.init
 Source2:	%{name}.conf
+Source3:	%{name}.tmpfiles
 URL:		http://smtp-proxy.klolik.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -64,9 +65,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},/etc/{rc.d/init.d,sysconfig}}
-install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},/var/spool/%{name}/{lock,msg}}
-install -d $RPM_BUILD_ROOT/var/run/%{name}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},/etc/{rc.d/init.d,sysconfig}} \
+	$RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},/var/spool/%{name}/{lock,msg}} \
+	$RPM_BUILD_ROOT{/var/run/%{name},/usr/lib/tmpfiles.d}
 
 install src/smtp-gated $RPM_BUILD_ROOT%{_sbindir}
 install doc/smtp-gated.8 $RPM_BUILD_ROOT%{_mandir}/man8
@@ -76,6 +77,8 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/smtp-gated
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
+install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
 :> $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
 %clean
@@ -115,6 +118,7 @@
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 %{_examplesdir}/%{name}-%{version}
+/usr/lib/tmpfiles.d/%{name}.conf
 %attr(750,smtpgw,clamav) /var/run/%{name}
 %attr(750,smtpgw,clamav) /var/spool/%{name}
 
@@ -124,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2012/01/31 11:32:11  baggins
+- added tmpfiles config for systemd
+
 Revision 1.35  2011/08/19 20:13:35  kosmo
 - updated to 1.4.17
 

================================================================
Index: packages/socat/socat.spec
diff -u packages/socat/socat.spec:1.36 packages/socat/socat.spec:1.37
--- packages/socat/socat.spec:1.36	Sat Dec 10 17:15:45 2011
+++ packages/socat/socat.spec	Tue Jan 31 12:32:12 2012
@@ -10,6 +10,7 @@
 # Source0-md5:	eb563dd00b9d39a49fb62a677fc941fe
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Source3:	%{name}.tmpfiles
 URL:		http://www.dest-unreach.org/socat/
 BuildRequires:	libwrap-devel >= 7.6-30
 BuildRequires:	openssl-devel >= 0.9.7d
@@ -56,13 +57,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/var/run/%{name}} \
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,%{name}}
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,%{name}} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 cat >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/example.conf <<'EOF'
 # socat [options] <bi-address> <bi-address>
@@ -93,6 +96,7 @@
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_bindir}/*
 %dir /var/run/%{name}
+/usr/lib/tmpfiles.d/%{name}.conf
 %{_mandir}/man?/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -101,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2012/01/31 11:32:12  baggins
+- added tmpfiles config for systemd
+
 Revision 1.36  2011/12/10 16:15:45  adamg
 - updated to 1.7.2.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.382&r2=1.383&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/red5/red5.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redis/redis.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smokeping/smokeping.spec?r1=1.73&r2=1.74&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smtp-gated/smtp-gated.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/socat/socat.spec?r1=1.36&r2=1.37&f=u

More information about the pld-cvs-commit mailing list