resolve conflict with perl-pmtools (bz 437612)

This commit is contained in:
Tom Callaway 2008-04-01 14:56:30 +00:00
parent 367e34450e
commit 9f1343179c

View File

@ -1,7 +1,7 @@
Summary: An info file viewer Summary: An info file viewer
Name: pinfo Name: pinfo
Version: 0.6.9 Version: 0.6.9
Release: 6%{?dist} Release: 7%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPLv2 License: GPLv2
URL: http://pinfo.alioth.debian.org URL: http://pinfo.alioth.debian.org
@ -14,8 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
Requires: xdg-utils Requires: xdg-utils
Requires(post): /sbin/install-info # for /sbin/install-info
Requires(preun): /sbin/install-info Requires(post): info
Requires(preun): info
%description %description
Pinfo is an info file (or man page) viewer with a user interface Pinfo is an info file (or man page) viewer with a user interface
@ -37,8 +38,9 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
ln -sf pinfo $RPM_BUILD_ROOT%{_bindir}/pman # These symbolic links conflict with actual binaries in perl-pmtools (bz 437612)
ln -sf pinfo.1 $RPM_BUILD_ROOT%{_mandir}/man1/pman.1 # 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 # This file should not be packaged
rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@ -51,10 +53,10 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# Purposefully not flagged noreplace to ensure new versions have working config # Purposefully not flagged noreplace to ensure new versions have working config
%config %{_sysconfdir}/pinforc %config %{_sysconfdir}/pinforc
%{_bindir}/pinfo %{_bindir}/pinfo
%{_bindir}/pman # %{_bindir}/pman
%{_infodir}/pinfo.info* %{_infodir}/pinfo.info*
%{_mandir}/man1/pinfo.1* %{_mandir}/man1/pinfo.1*
%{_mandir}/man1/pman.1* # %{_mandir}/man1/pman.1*
%post %post
/sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir /sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir
@ -70,6 +72,9 @@ fi
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Apr 1 2008 Tom "spot" Callaway <tcallawa@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@fedoraproject.org> - 0.6.9-6 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.6.9-6
- Autorebuild for GCC 4.3 - Autorebuild for GCC 4.3