Accepting request 86660 from home:rudi_m:branches:Base:System
minor portability fixes OBS-URL: https://build.opensuse.org/request/show/86660 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=27
This commit is contained in:
parent
fec3f970c1
commit
1a0ddee82e
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 5 11:38:57 UTC 2011 - sweet_f_a@gmx.de
|
||||||
|
|
||||||
|
- minor portability fixes
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 29 11:32:04 UTC 2011 - sweet_f_a@gmx.de
|
Thu Sep 29 11:32:04 UTC 2011 - sweet_f_a@gmx.de
|
||||||
|
|
||||||
|
25
tar.spec
25
tar.spec
@ -16,6 +16,8 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
# minimum suse version where the full featured package builds
|
||||||
|
%define min_suse_ver 1010
|
||||||
|
|
||||||
Name: tar
|
Name: tar
|
||||||
Version: 1.26
|
Version: 1.26
|
||||||
@ -28,10 +30,12 @@ Source0: %{name}-%{version}.tar.bz2
|
|||||||
#
|
#
|
||||||
Patch3: tar-wildcards.patch
|
Patch3: tar-wildcards.patch
|
||||||
Patch6: tar-backup-spec-fix-paths.patch
|
Patch6: tar-backup-spec-fix-paths.patch
|
||||||
|
%if 0%{?suse_version} >= %min_suse_ver
|
||||||
BuildRequires: help2man
|
BuildRequires: help2man
|
||||||
Requires(pre): info
|
|
||||||
Recommends: tar-lang = %{version}
|
Recommends: tar-lang = %{version}
|
||||||
Recommends: xz
|
Recommends: xz
|
||||||
|
%endif
|
||||||
|
Requires(pre): info
|
||||||
Provides: base:/bin/tar
|
Provides: base:/bin/tar
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%define _bindir /bin
|
%define _bindir /bin
|
||||||
@ -53,8 +57,8 @@ Requires: %{name} = %{version}
|
|||||||
%description backup-scripts
|
%description backup-scripts
|
||||||
Shell scripts for system backup/restore
|
Shell scripts for system backup/restore
|
||||||
|
|
||||||
|
%{?lang_package}
|
||||||
|
|
||||||
%lang_package
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
@ -74,16 +78,17 @@ make check
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
%{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}}
|
%{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}}
|
||||||
|
%if 0%{?suse_version} >= %min_suse_ver
|
||||||
install -d -m 755 %{buildroot}/%{_mandir}/man1
|
install -d -m 755 %{buildroot}/%{_mandir}/man1
|
||||||
help2man ./src/tar --name "The GNU version of the tar archiving utility" -p tar \
|
help2man ./src/tar --name "The GNU version of the tar archiving utility" -p tar \
|
||||||
| gzip -c > %{buildroot}/%{_mandir}/man1/tar.1.gz
|
| gzip -c > %{buildroot}/%{_mandir}/man1/tar.1.gz
|
||||||
|
%endif
|
||||||
install -d -m 755 %{buildroot}%{_sysconfdir}/backup
|
install -d -m 755 %{buildroot}%{_sysconfdir}/backup
|
||||||
install -D -m 644 scripts/backup-specs %{buildroot}%{_sysconfdir}/backup/backup-specs
|
install -D -m 644 scripts/backup-specs %{buildroot}%{_sysconfdir}/backup/backup-specs
|
||||||
rm -rf %{buildroot}%{_libexecdir}/rmt
|
rm -rf %{buildroot}%{_libexecdir}/rmt
|
||||||
|
rm -f %{buildroot}%{_infodir}/dir
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
%files lang -f %{name}.lang
|
|
||||||
|
|
||||||
%files backup-scripts
|
%files backup-scripts
|
||||||
%defattr(-,root, root)
|
%defattr(-,root, root)
|
||||||
%{_sbindir}/backup
|
%{_sbindir}/backup
|
||||||
@ -93,12 +98,22 @@ rm -rf %{buildroot}%{_libexecdir}/rmt
|
|||||||
%dir %{_sysconfdir}/backup
|
%dir %{_sysconfdir}/backup
|
||||||
%config(noreplace) %{_sysconfdir}/backup/backup-specs
|
%config(noreplace) %{_sysconfdir}/backup/backup-specs
|
||||||
|
|
||||||
|
%if 0%{?lang_package:1}
|
||||||
|
|
||||||
|
%files lang -f %{name}.lang
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
%else
|
||||||
|
|
||||||
|
%files -f %{name}.lang
|
||||||
|
%endif
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%{_bindir}/tar
|
%{_bindir}/tar
|
||||||
%doc README* ABOUT-NLS AUTHORS COPYING NEWS THANKS ChangeLog TODO
|
%doc README* ABOUT-NLS AUTHORS COPYING NEWS THANKS ChangeLog TODO
|
||||||
%{_infodir}/tar.info*.gz
|
%{_infodir}/tar.info*
|
||||||
|
%if 0%{?suse_version} >= %min_suse_ver
|
||||||
%{_mandir}/man1/tar.1.gz
|
%{_mandir}/man1/tar.1.gz
|
||||||
|
%endif
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
|
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
|
||||||
|
Loading…
Reference in New Issue
Block a user