rpms/pinfo/devel pinfo.spec,1.33,1.34

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/pinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13085

Modified Files:
	pinfo.spec 
Log Message:
resolve conflict with perl-pmtools (bz 437612)


Index: pinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinfo/devel/pinfo.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pinfo.spec	19 Feb 2008 14:09:55 -0000	1.33
+++ pinfo.spec	1 Apr 2008 14:56:30 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: An info file viewer
 Name: pinfo
 Version: 0.6.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: System Environment/Base
 License: GPLv2
 URL: http://pinfo.alioth.debian.org
@@ -14,8 +14,9 @@
 
 BuildRequires: ncurses-devel
 Requires: xdg-utils
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+# for /sbin/install-info
+Requires(post): info
+Requires(preun): info
 
 %description
 Pinfo is an info file (or man page) viewer with a user interface
@@ -37,8 +38,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-ln -sf pinfo $RPM_BUILD_ROOT%{_bindir}/pman
-ln -sf pinfo.1 $RPM_BUILD_ROOT%{_mandir}/man1/pman.1
+# These symbolic links conflict with actual binaries in perl-pmtools (bz 437612)
+# ln -sf pinfo $RPM_BUILD_ROOT%{_bindir}/pman
+# ln -sf pinfo.1 $RPM_BUILD_ROOT%{_mandir}/man1/pman.1
 
 # This file should not be packaged
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -51,10 +53,10 @@
 # Purposefully not flagged noreplace to ensure new versions have working config
 %config %{_sysconfdir}/pinforc
 %{_bindir}/pinfo
-%{_bindir}/pman
+# %{_bindir}/pman
 %{_infodir}/pinfo.info*
 %{_mandir}/man1/pinfo.1*
-%{_mandir}/man1/pman.1*
+# %{_mandir}/man1/pman.1*
 
 %post
 /sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir
@@ -70,6 +72,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Apr  1 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.9-7
+- drop symbolic links to avoid file conflict with perl-pmtools (bz 437612)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6.9-6
 - Autorebuild for GCC 4.3