testing/xz
SHA256
3
0
Fork 0
forked from pool/xz
Code Pull Requests Activity

Accepting request 506129 from home:AndreasStieger:branches:Archiving

Browse Source 
- fix CentOS/RHEL builds after clean-up

OBS-URL: https://build.opensuse.org/request/show/506129
OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=90
This commit is contained in:
Andreas Stieger 2017-06-25 17:03:45 +00:00 committed by Git OBS Bridge
parent 8f9b6826d8
commit 9894a94cf7
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xz.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Jun 25 11:37:03 UTC 2017 - astieger@suse.com
- fix CentOS/RHEL builds after clean-up
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 21 14:11:44 UTC 2017 - mpluskal@suse.com Wed Jun 21 14:11:44 UTC 2017 - mpluskal@suse.com

17
xz.spec
View File

@ -18,7 +18,6 @@
# avoid bootstrapping problem # avoid bootstrapping problem
%define _binary_payload w9.bzdio %define _binary_payload w9.bzdio
Name: xz Name: xz
Version: 5.2.3 Version: 5.2.3
Release: 0 Release: 0
@ -34,9 +33,12 @@ Source3: xz.keyring
Source4: xznew Source4: xznew
Source5: xznew.1 Source5: xznew.1
BuildRequires: pkgconfig BuildRequires: pkgconfig
Recommends: %{name}-lang
Provides: lzma = %{version} Provides: lzma = %{version}
Obsoletes: lzma < %{version} Obsoletes: lzma < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?lang_package:1}
Recommends: %{name}-lang
%endif
%description %description
The xz command is a very powerful program for compressing files. The xz command is a very powerful program for compressing files.
@ -90,7 +92,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now -pie"
%configure \ %configure \
--with-pic \ --with-pic \
--docdir=%{_docdir}/%{name} --docdir=%{_docdir}/%{name}
%if %{do_profiling} %if 0%{?do_profiling}
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
make check %{?_smp_mflags} make check %{?_smp_mflags}
make clean make clean
@ -103,7 +105,11 @@ export LDFLAGS="-Wl,-z,relro,-z,now -pie"
make %{?_smp_mflags} check make %{?_smp_mflags} check
%install %install
%if 0%{?make_install:1}
%make_install %make_install
%else
make DESTDIR=%{buildroot} install %{?_smp_mflags} #
%endif
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name} %find_lang %{name}
install -Dpm 0755 %{SOURCE4} %{buildroot}%{_bindir}/xznew install -Dpm 0755 %{SOURCE4} %{buildroot}%{_bindir}/xznew
@ -112,8 +118,10 @@ install -Dpm 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/xznew.1
%post -n liblzma5 -p /sbin/ldconfig %post -n liblzma5 -p /sbin/ldconfig
%postun -n liblzma5 -p /sbin/ldconfig %postun -n liblzma5 -p /sbin/ldconfig
%if 0%{?lang_package:1}
%files lang -f %{name}.lang %files lang -f %{name}.lang
%defattr(-, root, root) %defattr(-, root, root)
%endif
%files %files
%defattr(-, root, root) %defattr(-, root, root)
@ -166,6 +174,9 @@ install -Dpm 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/xznew.1
%{_mandir}/man1/xzless.1%{ext_man} %{_mandir}/man1/xzless.1%{ext_man}
%{_mandir}/man1/xzmore.1%{ext_man} %{_mandir}/man1/xzmore.1%{ext_man}
%{_mandir}/man1/xznew.1%{ext_man} %{_mandir}/man1/xznew.1%{ext_man}
%if 0%{!?lang_package:1}
%{_datadir}/locale/*/LC_MESSAGES/xz.mo
%endif
%files -n liblzma5 %files -n liblzma5
%defattr(-, root, root) %defattr(-, root, root)