pool/xz
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 104193 from home:elvigia:branches:Base:System

Browse Source 
- Put libraries back in %{_libdir}, /usr merge project.

OBS-URL: https://build.opensuse.org/request/show/104193
OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=44
This commit is contained in:
Cristian Rodríguez 2012-02-12 23:56:47 +00:00 committed by Git OBS Bridge
parent 4b86c176db
commit 834a01a971
2 changed files with 13 additions and 14 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 Feb 12 23:37:44 UTC 2012 - crrodriguez@opensuse.org
- Put libraries back in %{_libdir}, /usr merge project.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 9 15:25:02 UTC 2011 - sweet_f_a@gmx.de Sun Oct 9 15:25:02 UTC 2011 - sweet_f_a@gmx.de

22
xz.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xz # spec file for package xz
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,13 +16,12 @@
# #
Name: xz Name: xz
Summary: A Program for Compressing Files Summary: A Program for Compressing Files
Version: 5.0.3 License: LGPL-2.1+
Release: 2
Group: Productivity/Archiving/Compression Group: Productivity/Archiving/Compression
License: LGPLv2.1+ Version: 5.0.3
Release: 0
Url: http://tukaani.org/lzma/ Url: http://tukaani.org/lzma/
Source: http://tukaani.org/xz/%{name}-%{version}.tar.bz2 Source: http://tukaani.org/xz/%{name}-%{version}.tar.bz2
Source2: baselibs.conf Source2: baselibs.conf
@ -65,7 +64,6 @@ The xz command is a very powerful program for compressing files.
%{?lang_package} %{?lang_package}
%package -n liblzma5 %package -n liblzma5
License: LGPLv2.1+
Summary: LZMA library Summary: LZMA library
Group: System/Libraries Group: System/Libraries
@ -73,7 +71,6 @@ Group: System/Libraries
Library for encoding/decoding LZMA files. Library for encoding/decoding LZMA files.
%package devel %package devel
License: LGPLv2.1+
Summary: Development package for the LZMA library Summary: Development package for the LZMA library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: liblzma5 = %{version} Requires: liblzma5 = %{version}
@ -95,13 +92,13 @@ profiledir=$(mktemp -d)
trap "rm -rf $profiledir" EXIT trap "rm -rf $profiledir" EXIT
export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir" export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir"
%endif %endif
%configure --libdir=/%{_lib} --disable-static --with-pic --docdir=%_docdir/%name %configure --disable-static --with-pic --docdir=%_docdir/%name
make %{?_smp_mflags} make %{?_smp_mflags}
%if %{do_profiling} %if %{do_profiling}
time make check time make check
make clean make clean
export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir" export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir"
%configure --libdir=/%{_lib} --disable-static --with-pic --docdir=%_docdir/%name %configure --disable-static --with-pic --docdir=%_docdir/%name
make %{?_smp_mflags} make %{?_smp_mflags}
%endif %endif
@ -110,10 +107,7 @@ time make check
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
%{__mkdir_p} %{buildroot}%{_libdir} %{__rm} -v %{buildroot}%{_libdir}/liblzma.la
%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/liblzma.so) %{buildroot}%{_libdir}/liblzma.so
%{__mv} -v %{buildroot}/%{_lib}/pkgconfig %{buildroot}%{_libdir}
%{__rm} -v %{buildroot}/%{_lib}/liblzma.{so,la}
%find_lang %{name} %find_lang %{name}
%post -n liblzma5 -p /sbin/ldconfig %post -n liblzma5 -p /sbin/ldconfig
@ -136,7 +130,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
%files -n liblzma5 %files -n liblzma5
%defattr(-, root, root) %defattr(-, root, root)
/%{_lib}/lib*.so.5* %{_libdir}/lib*.so.5*
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)