[packages/zzuf] - rename zzcat to zzufcat (resolve conflict with zziplib utils)

qboosh qboosh at pld-linux.org
Tue Dec 4 17:41:42 CET 2012


commit 91306890431c59398794026a2a2c2e8546e95876
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Dec 4 17:42:16 2012 +0100

    - rename zzcat to zzufcat (resolve conflict with zziplib utils)

 zzuf.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/zzuf.spec b/zzuf.spec
index 882abb7..7c848dd 100644
--- a/zzuf.spec
+++ b/zzuf.spec
@@ -25,6 +25,9 @@ deterministyczne, dzięki czemu reprodukcja błędów jest łatwa.
 %prep
 %setup -q
 
+# rename due to conflict with zziplib
+%{__sed} -i -e 's/zzcat/zzufcat/' doc/zzcat.1.in doc/zzuf.1.in
+
 %build
 %configure \
 	--disable-static
@@ -39,16 +42,20 @@ rm -rf $RPM_BUILD_ROOT
 # preloadable library
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/zzuf/libzzuf.la
 
+# rename due to conflict with zziplib
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{zzcat,zzufcat}
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/{zzcat,zzufcat}.1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/zzcat
 %attr(755,root,root) %{_bindir}/zzuf
+%attr(755,root,root) %{_bindir}/zzufcat
 %dir %{_libdir}/zzuf
 %attr(755,root,root) %{_libdir}/zzuf/libzzuf.so
-%{_mandir}/man1/zzcat.1*
 %{_mandir}/man1/zzuf.1*
+%{_mandir}/man1/zzufcat.1*
 %{_mandir}/man3/libzzuf.3*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zzuf.git/commitdiff/91306890431c59398794026a2a2c2e8546e95876



More information about the pld-cvs-commit mailing list