Browse Source

resolve conflict between these two packages

master
parent
commit
3c260f9d90
  1. 6
      fileutils/fileutils.spec
  2. 6
      textutils/textutils.spec

6
fileutils/fileutils.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [REL]
Group: GNU
License: GPL
Version: 4.1.2
Release: 20011201
Release: 20011213
# list of sources
Source0: ftp://alpha.gnu.org/gnu/fetish/fileutils-%{version}.tar.gz
@ -65,6 +65,10 @@ AutoReqProv: no
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
mv $RPM_BUILD_ROOT%{l_prefix}/info/coreutils.info \
$RPM_BUILD_ROOT%{l_prefix}/info/fileutils.info
%{l_rpmtool} subst 's;coreutils;fileutils;g' \
-- $RPM_BUILD_ROOT%{l_prefix}/info/fileutils.info
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2> /dev/null || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib

6
textutils/textutils.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [REL]
Group: GNU
License: GPL
Version: 2.0.17
Release: 20011201
Release: 20011213
# list of sources
Source0: ftp://alpha.gnu.org/gnu/fetish/textutils-%{version}.tar.gz
@ -65,6 +65,10 @@ AutoReqProv: no
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
mv $RPM_BUILD_ROOT%{l_prefix}/info/coreutils.info \
$RPM_BUILD_ROOT%{l_prefix}/info/textutils.info
%{l_rpmtool} subst 's;coreutils;textutils;g' \
-- $RPM_BUILD_ROOT%{l_prefix}/info/textutils.info
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib

Loading…
Cancel
Save