Author: glen Date: Mon May 28 19:08:13 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- systemd macros
---- Files affected:
packages/autossh:
autossh.spec (1.24 -> 1.25)
---- Diffs:
================================================================
Index: packages/autossh/autossh.spec
diff -u packages/autossh/autossh.spec:1.24 packages/autossh/autossh.spec:1.25
--- packages/autossh/autossh.spec:1.24 Mon May 28 21:06:29 2012
+++ packages/autossh/autossh.spec Mon May 28 21:08:07 2012
@@ -12,6 +12,7 @@
Source2: %{name}.tab
Source3: %{name}.tmpfiles
URL: http://www.harding.motd.ca/autossh/
+BuildRequires: rpmbuild(macros) >= 1.647
Requires: openssh-clients
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,7 +43,7 @@
Summary(pl.UTF-8): konfiguracja autossh jako usługi systemowej
Group: Networking/Daemons
Requires(post,preun): /sbin/chkconfig
-Requires: autossh = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: awk
Requires: rc-scripts >= 0.4.0.20
@@ -66,11 +67,11 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{_bindir},%{_mandir}/man1} \
- $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+ $RPM_BUILD_ROOT%{systemdtmpfilesdir}
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/autossh.tab
-cp -p %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
install -p autossh $RPM_BUILD_ROOT%{_bindir}
cp -p autossh.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -98,7 +99,7 @@
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.tab
%attr(754,root,root) /etc/rc.d/init.d/%{name}
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
%dir /var/run/autossh
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -107,6 +108,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2012/05/28 19:08:07 glen
+- systemd macros
+
Revision 1.24 2012/05/28 19:06:29 glen
- pass path to ssh
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/autossh/autossh.spec?r1=1.24&r2=1.25
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
