rpms/tar
7
0
Fork 0
Code Issues Pull Requests Releases Activity

cleaner use of %macros

Browse Source 
Version: 1.30-6
This commit is contained in:
Pavel Raiskup 2018-08-07 13:28:52 +02:00
parent 6d11a113b0
commit c0f09b684b
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tar.spec
View File

@ -1,12 +1,11 @@
%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %bcond_without selinux
%global WITH_SELINUX 1 %bcond_without check
%endif
Summary: A GNU file archiving program Summary: A GNU file archiving program
Name: tar Name: tar
Epoch: 2 Epoch: 2
Version: 1.30 Version: 1.30
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Archiving Group: Applications/Archiving
URL: http://www.gnu.org/software/tar/ URL: http://www.gnu.org/software/tar/
@ -24,9 +23,6 @@ Patch11: tar-1.28-sparse-inf-loops.patch
Patch12: tar-1.30-tests-difflink.patch Patch12: tar-1.30-tests-difflink.patch
Patch13: tar-1.30-tests-dirrem.patch Patch13: tar-1.30-tests-dirrem.patch
# run "make check" by default
%bcond_without check
BuildRequires: gcc BuildRequires: gcc
BuildRequires: autoconf automake texinfo gettext libacl-devel BuildRequires: autoconf automake texinfo gettext libacl-devel
@ -35,7 +31,7 @@ BuildRequires: autoconf automake texinfo gettext libacl-devel
BuildRequires: attr acl policycoreutils BuildRequires: attr acl policycoreutils
%endif %endif
%if %{WITH_SELINUX} %if %{with selinux}
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
%endif %endif
Provides: bundled(gnulib) Provides: bundled(gnulib)
@ -54,6 +50,7 @@ backups.
If you want to use tar for remote backups, you also need to install If you want to use tar for remote backups, you also need to install
the rmt package on the remote box. the rmt package on the remote box.
%prep %prep
%autosetup -p1 %autosetup -p1
autoreconf -v autoreconf -v
@ -65,18 +62,17 @@ awk 'stop = false; /^2014-07-27/ { stop = true; exit }; { print }' \
%build %build
%if ! %{WITH_SELINUX} %configure \
%global CONFIGURE_SELINUX --without-selinux %{!?with_selinux:--without-selinux} \
%endif
%configure %{?CONFIGURE_SELINUX} \
--with-lzma="xz --format=lzma" \ --with-lzma="xz --format=lzma" \
DEFAULT_RMT_DIR=%{_sysconfdir} \ DEFAULT_RMT_DIR=%{_sysconfdir} \
RSH=/usr/bin/ssh RSH=/usr/bin/ssh
make %{?_smp_mflags}
%make_build
%install %install
make DESTDIR=$RPM_BUILD_ROOT install %make_install
ln -s tar $RPM_BUILD_ROOT%{_bindir}/gtar ln -s tar $RPM_BUILD_ROOT%{_bindir}/gtar
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
@ -89,6 +85,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man8/rmt.8*
%find_lang %name %find_lang %name
%check %check
%if %{with check} %if %{with check}
rm -f $RPM_BUILD_ROOT/test/testsuite rm -f $RPM_BUILD_ROOT/test/testsuite
@ -104,6 +101,7 @@ make check || (
) )
%endif %endif
%files -f %{name}.lang %files -f %{name}.lang
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
@ -114,7 +112,11 @@ make check || (
%{_mandir}/man1/gtar.1* %{_mandir}/man1/gtar.1*
%{_infodir}/tar.info* %{_infodir}/tar.info*
%changelog %changelog
* Tue Aug 07 2018 Pavel Raiskup <praiskup@redhat.com> - 1.30-6
- use %%bcond_* for selinux, use %%make_* macros
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.30-5 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.30-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild