commit f012ea02243962e7c1c2a67d1173f9c61e5ae508
Author: Sławomir Paszkiewicz <paszc...@pld-linux.org>
Date: Sat May 3 17:09:57 2014 +0200
- adaptarized
quagga.spec | 72 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/quagga.spec b/quagga.spec
index 034c199..a5aedc6 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -97,11 +97,11 @@ zgromadzenie bardziej zaangażowanej społeczności wokół
projektu, niż w
aktualnie scentralizowanym modelu GNU Zebry.
%package babeld
-Summary: BABEL wireless mesh routing daemon
-Summary(pl.UTF-8): Demon routingu BABEL
-Group: Networking/Daemons
-Requires(post,preun): /sbin/chkconfig
-Requires: %{name} = %{version}-%{release}
+Summary: BABEL wireless mesh routing daemon
+Summary(pl.UTF-8): Demon routingu BABEL
+Group: Networking/Daemons
+Requires(post,preun): /sbin/chkconfig
+Requires: %{name} = %{version}-%{release}
%description babeld
BABEL wireless mesh routing daemon. Includes IPv6 support.
@@ -252,40 +252,40 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{env.d,logrotate.d,pam.d,rc.d/init.d,sysconfig}
\
$RPM_BUILD_ROOT/var/log/{archive,}/%{name} \
$RPM_BUILD_ROOT%{_var}/run/%{name} \
- $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+ $RPM_BUILD_ROOT%{systemdtmpfilesdir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/zebra
-install %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
-
-install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/zebra
-install %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bgpd
-install %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospf6d
-install %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd
-install %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd
-install %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd
-install %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/isisd
-install %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/babeld
-
-install %{SOURCE20} $RPM_BUILD_ROOT/etc/sysconfig/zebra
-install %{SOURCE21} $RPM_BUILD_ROOT/etc/sysconfig/bgpd
-install %{SOURCE22} $RPM_BUILD_ROOT/etc/sysconfig/ospf6d
-install %{SOURCE23} $RPM_BUILD_ROOT/etc/sysconfig/ospfd
-install %{SOURCE24} $RPM_BUILD_ROOT/etc/sysconfig/ripd
-install %{SOURCE25} $RPM_BUILD_ROOT/etc/sysconfig/ripngd
-install %{SOURCE26} $RPM_BUILD_ROOT/etc/sysconfig/isisd
-install %{SOURCE27} $RPM_BUILD_ROOT/etc/sysconfig/babeld
-
-install %{SOURCE30} $RPM_BUILD_ROOT/etc/logrotate.d/zebra
-install %{SOURCE31} $RPM_BUILD_ROOT/etc/logrotate.d/bgpd
-install %{SOURCE32} $RPM_BUILD_ROOT/etc/logrotate.d/ospfd
-install %{SOURCE33} $RPM_BUILD_ROOT/etc/logrotate.d/ospf6d
-install %{SOURCE34} $RPM_BUILD_ROOT/etc/logrotate.d/ripd
-install %{SOURCE35} $RPM_BUILD_ROOT/etc/logrotate.d/ripngd
-install %{SOURCE36} $RPM_BUILD_ROOT/etc/logrotate.d/isisd
-install %{SOURCE37} $RPM_BUILD_ROOT/etc/logrotate.d/babeld
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/zebra
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+
+cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/zebra
+cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bgpd
+cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospf6d
+cp -p %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd
+cp -p %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd
+cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd
+cp -p %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/isisd
+cp -p %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/babeld
+
+cp -p %{SOURCE20} $RPM_BUILD_ROOT/etc/sysconfig/zebra
+cp -p %{SOURCE21} $RPM_BUILD_ROOT/etc/sysconfig/bgpd
+cp -p %{SOURCE22} $RPM_BUILD_ROOT/etc/sysconfig/ospf6d
+cp -p %{SOURCE23} $RPM_BUILD_ROOT/etc/sysconfig/ospfd
+cp -p %{SOURCE24} $RPM_BUILD_ROOT/etc/sysconfig/ripd
+cp -p %{SOURCE25} $RPM_BUILD_ROOT/etc/sysconfig/ripngd
+cp -p %{SOURCE26} $RPM_BUILD_ROOT/etc/sysconfig/isisd
+cp -p %{SOURCE27} $RPM_BUILD_ROOT/etc/sysconfig/babeld
+
+cp -p %{SOURCE30} $RPM_BUILD_ROOT/etc/logrotate.d/zebra
+cp -p %{SOURCE31} $RPM_BUILD_ROOT/etc/logrotate.d/bgpd
+cp -p %{SOURCE32} $RPM_BUILD_ROOT/etc/logrotate.d/ospfd
+cp -p %{SOURCE33} $RPM_BUILD_ROOT/etc/logrotate.d/ospf6d
+cp -p %{SOURCE34} $RPM_BUILD_ROOT/etc/logrotate.d/ripd
+cp -p %{SOURCE35} $RPM_BUILD_ROOT/etc/logrotate.d/ripngd
+cp -p %{SOURCE36} $RPM_BUILD_ROOT/etc/logrotate.d/isisd
+cp -p %{SOURCE37} $RPM_BUILD_ROOT/etc/logrotate.d/babeld
touch
$RPM_BUILD_ROOT/var/log/%{name}/{zebra,babeld,bgpd,isisd,ospf6d,ospfd,ripd,ripngd}.log
@@ -428,7 +428,7 @@ fi
%dir %attr(770,root,quagga) %{_sysconfdir}
%config(noreplace) %verify(not md5 mtime size) %attr(660,root,quagga)
%{_sysconfdir}/vtysh.conf
%config(noreplace) %verify(not md5 mtime size) %attr(660,root,quagga)
%{_sysconfdir}/zebra.conf
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
%dir %attr(770,root,quagga) /var/run/%{name}
%dir %attr(750,quagga,quagga) /var/log/%{name}
%dir %attr(750,quagga,quagga) /var/log/archive/%{name}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/quagga.git/commitdiff/f012ea02243962e7c1c2a67d1173f9c61e5ae508
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
