Author: baggins Date: Wed Mar 21 11:33:02 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 8 - spec cleanup - removed duplicate file
---- Files affected: packages/rc-scripts: rc-scripts.spec (1.392 -> 1.393) , rc-scripts-systemd-tmpfiles.d.conf (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/rc-scripts/rc-scripts.spec diff -u packages/rc-scripts/rc-scripts.spec:1.392 packages/rc-scripts/rc-scripts.spec:1.393 --- packages/rc-scripts/rc-scripts.spec:1.392 Wed Mar 21 12:19:10 2012 +++ packages/rc-scripts/rc-scripts.spec Wed Mar 21 12:32:57 2012 @@ -10,16 +10,15 @@ Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts Version: 0.4.5.3 -Release: 7 +Release: 8 License: GPL v2 Group: Base #Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz # Source0-md5: ac04b9e70d2bb1583f5ea41dd2d1894e -Source1: rc-scripts-systemd-tmpfiles.d.conf -Source2: rc-local.service -Source3: sys-chroots.service -Source4: %{name}.tmpfiles +Source1: rc-local.service +Source2: sys-chroots.service +Source3: %{name}.tmpfiles URL: http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts Patch0: %{name}-skip_networkmanager_users_config.patch Patch1: %{name}-svn.patch @@ -83,9 +82,9 @@ %else Conflicts: udev-core < 1:124-3 %endif +Conflicts: lvm2 < 2.02.83 Conflicts: upstart-SysVinit < 2.86-25 Conflicts: wpa_supplicant < 0.6.3 -Conflicts: lvm2 < 2.02.83 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _exec_prefix / @@ -142,7 +141,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \ $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles \ - $RPM_BUILD_ROOT/usr/lib/tmpfiles.d + $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ @@ -192,11 +191,10 @@ ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d # systemd -install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/rc-scripts.conf -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/local.service -install -D %{SOURCE2} $RPM_BUILD_ROOT/lib/systemd/system/rc-local.service -install -D %{SOURCE3} $RPM_BUILD_ROOT/lib/systemd/system/sys-chroots.service -install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf +install %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service +ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/local.service +install %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/sys-chroots.service +install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf %if "%{pld_release}" == "ac" rm -rf $RPM_BUILD_ROOT/etc/init @@ -319,10 +317,10 @@ %attr(755,root,root) /lib/firmware/firmware-loader.sh -/usr/lib/tmpfiles.d/rc-scripts.conf -/lib/systemd/system/local.service -/lib/systemd/system/rc-local.service -/lib/systemd/system/sys-chroots.service +%{systemdtmpfilesdir}/rc-scripts.conf +%{systemdunitdir}/local.service +%{systemdunitdir}/rc-local.service +%{systemdunitdir}/sys-chroots.service %dir /lib/rc-scripts %attr(755,root,root) /lib/rc-scripts/ifdown-br @@ -365,7 +363,6 @@ %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 @@ -403,6 +400,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.393 2012/03/21 11:32:57 baggins +- rel 8 +- spec cleanup +- removed duplicate file + Revision 1.392 2012/03/21 11:19:10 baggins - rel 7 - install systemd rc-local.service as rc-local and mas out local.service ================================================================ ---- CVS-web: http://cvs.pld-linux.org//packages/rc-scripts/rc-scripts.spec?r1=1.392&r2=1.393&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
