diff --git a/tar.spec b/tar.spec index ef6096d..8ff6962 100644 --- a/tar.spec +++ b/tar.spec @@ -39,6 +39,9 @@ BuildRequires: libselinux-devel Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info +Conflicts: filesystem < 3 +Provides: /bin/tar +Provides: /bin/gtar %description The GNU tar program saves many files together in one archive and can @@ -66,7 +69,7 @@ the rmt package. autoreconf %build -%configure --bindir=/bin --libexecdir=/sbin \ +%configure --bindir=%{_bindir} --libexecdir=%{_sbindir} \ %if %{WITH_SELINUX} --enable-selinux %endif @@ -74,16 +77,16 @@ make %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT bindir=/bin libexecdir=/sbin install +make DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} libexecdir=%{_sbindir} install -ln -s tar ${RPM_BUILD_ROOT}/bin/gtar +ln -s tar ${RPM_BUILD_ROOT}%{_bindir}/gtar rm -f $RPM_BUILD_ROOT/%{_infodir}/dir mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 install -c -p -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_mandir}/man1 ln -s tar.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtar.1 # XXX Nuke unpackaged files. -rm -f ${RPM_BUILD_ROOT}/sbin/rmt +rm -f ${RPM_BUILD_ROOT}%{_sbindir}/rmt %find_lang %name @@ -110,8 +113,8 @@ fi %defattr(-,root,root) %doc AUTHORS ChangeLog ChangeLog.1 COPYING NEWS README THANKS TODO %ifos linux -/bin/tar -/bin/gtar +%{_bindir}/tar +%{_bindir}/gtar %{_mandir}/man1/tar.1* %{_mandir}/man1/gtar.1* %else