[packages/debianutils] do not conflict with rc-scripts >= 0.4.8 packaging run-parts
glen
glen at pld-linux.org
Tue Feb 18 14:10:11 CET 2014
commit dd448c743bcd1f25269f6b788b13769a2fdec073
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Feb 18 13:09:29 2014 +0000
do not conflict with rc-scripts >= 0.4.8 packaging run-parts
debianutils.spec | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/debianutils.spec b/debianutils.spec
index 21fe5ee..fb55520 100644
--- a/debianutils.spec
+++ b/debianutils.spec
@@ -2,7 +2,7 @@ Summary: Miscellaneous utilities specific to Debian
Summary(pl.UTF-8): Różne narzędzia specyficzne dla Debiana
Name: debianutils
Version: 4.4
-Release: 1
+Release: 2
License: GPL v2+, distributale
Group: Applications
Source0: http://ftp.debian.org/debian/pool/main/d/debianutils/%{name}_%{version}.tar.gz
@@ -16,7 +16,7 @@ primarily by the installation scripts of Debian packages, although you
may use them directly.
The specific utilities included are: add-shell installkernel ischroot
-remove-shell run-parts savelog tempfile.
+remove-shell savelog tempfile.
%description -l pl.UTF-8
Ten pakiet udostępnia kilka małych narzędzi które są używane głównie
@@ -24,7 +24,7 @@ przez skrypty instalacyjne pakietów Debiana, aczkolwiek możesz używać
ich bezpośrednio.
Te specyficzne narzędzia to: add-shell installkernel ischroot
-remove-shell run-parts savelog tempfile.
+remove-shell savelog tempfile.
%prep
%setup -q
@@ -42,13 +42,15 @@ rm -rf $RPM_BUILD_ROOT
# which.spec is more advanced and is binary
%{__rm} -r $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/{*/,}man1}/which*
+# run-parts is contained in rc-scripts
+%{__rm} $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/{*/,}man8}/run-parts*
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ischroot
-%attr(755,root,root) %{_bindir}/run-parts
%attr(755,root,root) %{_bindir}/savelog
%attr(755,root,root) %{_bindir}/tempfile
%attr(755,root,root) %{_sbindir}/add-shell
@@ -59,47 +61,39 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/add-shell.8*
%{_mandir}/man8/installkernel.8*
%{_mandir}/man8/remove-shell.8*
-%{_mandir}/man8/run-parts.8*
%{_mandir}/man8/savelog.8*
%lang(de) %{_mandir}/de/man1/tempfile.1*
%lang(de) %{_mandir}/de/man8/add-shell.8*
%lang(de) %{_mandir}/de/man8/installkernel.8*
%lang(de) %{_mandir}/de/man8/remove-shell.8*
-%lang(de) %{_mandir}/de/man8/run-parts.8*
%lang(de) %{_mandir}/de/man8/savelog.8*
%lang(es) %{_mandir}/es/man1/tempfile.1*
%lang(es) %{_mandir}/es/man8/add-shell.8*
%lang(es) %{_mandir}/es/man8/installkernel.8*
%lang(es) %{_mandir}/es/man8/remove-shell.8*
-%lang(es) %{_mandir}/es/man8/run-parts.8*
%lang(es) %{_mandir}/es/man8/savelog.8*
%lang(fr) %{_mandir}/fr/man1/tempfile.1*
%lang(fr) %{_mandir}/fr/man8/add-shell.8*
%lang(fr) %{_mandir}/fr/man8/installkernel.8*
%lang(fr) %{_mandir}/fr/man8/remove-shell.8*
-%lang(fr) %{_mandir}/fr/man8/run-parts.8*
%lang(fr) %{_mandir}/fr/man8/savelog.8*
%lang(it) %{_mandir}/it/man1/tempfile.1*
%lang(it) %{_mandir}/it/man8/add-shell.8*
%lang(it) %{_mandir}/it/man8/installkernel.8*
%lang(it) %{_mandir}/it/man8/remove-shell.8*
-%lang(it) %{_mandir}/it/man8/run-parts.8*
%lang(it) %{_mandir}/it/man8/savelog.8*
%lang(ja) %{_mandir}/ja/man1/tempfile.1*
%lang(ja) %{_mandir}/ja/man8/add-shell.8*
%lang(ja) %{_mandir}/ja/man8/installkernel.8*
%lang(ja) %{_mandir}/ja/man8/remove-shell.8*
-%lang(ja) %{_mandir}/ja/man8/run-parts.8*
%lang(ja) %{_mandir}/ja/man8/savelog.8*
%lang(pl) %{_mandir}/pl/man1/tempfile.1*
%lang(pl) %{_mandir}/pl/man8/add-shell.8*
%lang(pl) %{_mandir}/pl/man8/installkernel.8*
%lang(pl) %{_mandir}/pl/man8/remove-shell.8*
-%lang(pl) %{_mandir}/pl/man8/run-parts.8*
%lang(pl) %{_mandir}/pl/man8/savelog.8*
%lang(sl) %{_mandir}/sl/man1/tempfile.1*
%lang(sl) %{_mandir}/sl/man8/add-shell.8*
%lang(sl) %{_mandir}/sl/man8/installkernel.8*
%lang(sl) %{_mandir}/sl/man8/remove-shell.8*
-%lang(sl) %{_mandir}/sl/man8/run-parts.8*
%lang(sl) %{_mandir}/sl/man8/savelog.8*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/debianutils.git/commitdiff/dd448c743bcd1f25269f6b788b13769a2fdec073
More information about the pld-cvs-commit
mailing list