Hello community,

here is the log from the commit of package xz for openSUSE:Factory checked in 
at 2012-02-15 16:18:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xz (Old)
 and      /work/SRC/openSUSE:Factory/.xz.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xz", Maintainer is "co...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/xz/xz.changes    2011-10-11 17:07:30.000000000 
+0200
+++ /work/SRC/openSUSE:Factory/.xz.new/xz.changes       2012-02-15 
16:19:35.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Feb 12 23:37:44 UTC 2012 - crrodrig...@opensuse.org
+
+- Put libraries back in %{_libdir}, /usr merge project. 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xz.spec ++++++
--- /var/tmp/diff_new_pack.8aAx4Q/_old  2012-02-15 16:19:36.000000000 +0100
+++ /var/tmp/diff_new_pack.8aAx4Q/_new  2012-02-15 16:19:36.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # 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
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,13 +16,12 @@
 #
 
 
-
 Name:           xz
 Summary:        A Program for Compressing Files
-Version:        5.0.3
-Release:        2
-Group:          Productivity/Archiving/Compression
 License:        LGPL-2.1+
+Group:          Productivity/Archiving/Compression
+Version:        5.0.3
+Release:        0
 Url:            http://tukaani.org/lzma/
 Source:         http://tukaani.org/xz/%{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
@@ -65,7 +64,6 @@
 %{?lang_package}
 
 %package -n liblzma5
-License:        LGPL-2.1+
 Summary:        LZMA library
 Group:          System/Libraries
 
@@ -73,7 +71,6 @@
 Library for encoding/decoding LZMA files.
 
 %package devel
-License:        LGPL-2.1+
 Summary:        Development package for the LZMA library
 Group:          Development/Libraries/C and C++
 Requires:       liblzma5 = %{version}
@@ -95,13 +92,13 @@
 trap "rm -rf $profiledir" EXIT
 export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir"
 %endif
-%configure --libdir=/%{_lib} --disable-static --with-pic 
--docdir=%_docdir/%name
+%configure --disable-static --with-pic --docdir=%_docdir/%name
 make %{?_smp_mflags}
 %if %{do_profiling}
 time make check
 make clean
 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}
 %endif
 
@@ -110,10 +107,7 @@
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-%{__mkdir_p} %{buildroot}%{_libdir}
-%{__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}
+%{__rm} -v %{buildroot}%{_libdir}/liblzma.la
 %find_lang %{name}
 
 %post -n liblzma5 -p /sbin/ldconfig
@@ -136,7 +130,7 @@
 
 %files -n liblzma5
 %defattr(-, root, root)
-/%{_lib}/lib*.so.5*
+%{_libdir}/lib*.so.5*
 
 %files devel
 %defattr(-, root, root)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to