This commit is contained in:
parent
9daea59c7a
commit
31c7e1136c
113
project.diff
113
project.diff
@ -1,113 +0,0 @@
|
|||||||
--- xz.changes.orig
|
|
||||||
+++ xz.changes
|
|
||||||
@@ -1,4 +1,11 @@
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
+Sun Nov 24 16:25:53 UTC 2013 - andreas.stieger@gmx.de
|
|
||||||
+
|
|
||||||
+- verify source signature
|
|
||||||
+- add optional -static library package, intended to publish pixz for
|
|
||||||
+ CentOS / RHEL, default off
|
|
||||||
+
|
|
||||||
+-------------------------------------------------------------------
|
|
||||||
Tue Jul 16 13:52:16 UTC 2013 - idonmez@suse.com
|
|
||||||
|
|
||||||
- Update to version 5.0.5
|
|
||||||
@@ -55,6 +62,11 @@ Fri Jul 6 10:18:06 UTC 2012 - sweet_f_a
|
|
||||||
- correct license "LGPL-2.1+ and GPL-2.0+" (bnc#770195)
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
+Mon May 7 08:30:57 UTC 2012 - werner@suse.de
|
|
||||||
+
|
|
||||||
+- Enforce usage of reentrant versions of libc functions
|
|
||||||
+
|
|
||||||
+-------------------------------------------------------------------
|
|
||||||
Sun Feb 12 23:37:44 UTC 2012 - crrodriguez@opensuse.org
|
|
||||||
|
|
||||||
- Put libraries back in %{_libdir}, /usr merge project.
|
|
||||||
--- xz.spec.orig
|
|
||||||
+++ xz.spec
|
|
||||||
@@ -16,15 +16,25 @@
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
+%if 0%{?centos_version} || 0%{?rhel_version}
|
|
||||||
+%if 0%{?centos_version} <= 600 || 0%{?rhel_version <= 600}
|
|
||||||
+%bcond_without static_libs
|
|
||||||
+%endif
|
|
||||||
+%else
|
|
||||||
+%bcond_with static_libs
|
|
||||||
+%endif
|
|
||||||
+
|
|
||||||
Name: xz
|
|
||||||
Summary: A Program for Compressing Files
|
|
||||||
License: LGPL-2.1+ and GPL-2.0+
|
|
||||||
Group: Productivity/Archiving/Compression
|
|
||||||
Version: 5.0.5
|
|
||||||
Release: 0
|
|
||||||
-Url: http://tukaani.org/lzma/
|
|
||||||
-Source: http://tukaani.org/xz/%{name}-%{version}.tar.xz
|
|
||||||
+Url: http://tukaani.org/xz/
|
|
||||||
+Source: http://tukaani.org/xz/%{name}-%{version}.tar.bz2
|
|
||||||
Source2: baselibs.conf
|
|
||||||
+Source3: http://tukaani.org/xz/%{name}-%{version}.tar.bz2.sig
|
|
||||||
+Source4: http://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildRequires: pkgconfig
|
|
||||||
Provides: lzma = %version
|
|
||||||
@@ -83,22 +93,43 @@ Obsoletes: lzma-alpha-devel < %vers
|
|
||||||
This package contains the header files and libraries needed for
|
|
||||||
compiling programs using the LZMA library.
|
|
||||||
|
|
||||||
+%if %{with static_libs}
|
|
||||||
+%package static
|
|
||||||
+Summary: Static version of LZMA library
|
|
||||||
+Group: Development/Libraries/C and C++
|
|
||||||
+Requires: lzma-devel = %version
|
|
||||||
+
|
|
||||||
+%description static
|
|
||||||
+Static library for the LZMA library
|
|
||||||
+%endif
|
|
||||||
+
|
|
||||||
%prep
|
|
||||||
%setup -q
|
|
||||||
|
|
||||||
%build
|
|
||||||
+%global optflags %{optflags} -D_REENTRANT -pipe
|
|
||||||
%if %{do_profiling}
|
|
||||||
profiledir=$(mktemp -d)
|
|
||||||
trap "rm -rf $profiledir" EXIT
|
|
||||||
export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir"
|
|
||||||
%endif
|
|
||||||
-%configure --disable-static --with-pic --docdir=%_docdir/%name
|
|
||||||
+%configure \
|
|
||||||
+%if ! %{with static_libs}
|
|
||||||
+ --disable-static \
|
|
||||||
+%endif
|
|
||||||
+ --with-pic \
|
|
||||||
+ --docdir=%_docdir/%name
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
%if %{do_profiling}
|
|
||||||
time make check
|
|
||||||
make clean
|
|
||||||
export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir"
|
|
||||||
-%configure --disable-static --with-pic --docdir=%_docdir/%name
|
|
||||||
+%configure \
|
|
||||||
+%if ! %{with static_libs}
|
|
||||||
+ --disable-static \
|
|
||||||
+%endif
|
|
||||||
+ --with-pic \
|
|
||||||
+ --docdir=%_docdir/%name
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
@@ -139,4 +170,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|
||||||
%{_libdir}/lib*.so
|
|
||||||
%{_libdir}/pkgconfig/*.pc
|
|
||||||
|
|
||||||
+%if %{with static_libs}
|
|
||||||
+%files static
|
|
||||||
+%defattr(-, root, root)
|
|
||||||
+%{_libdir}/*.a
|
|
||||||
+%endif
|
|
||||||
+
|
|
||||||
%changelog
|
|
Loading…
Reference in New Issue
Block a user