From 834a01a971eec9a09a031c3b0511a1ff0be2d676f66bd446fa1102e08ed59f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Sun, 12 Feb 2012 23:56:47 +0000
Subject: [PATCH] Accepting request 104193 from
 home:elvigia:branches:Base:System

- 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
---
 xz.changes |  5 +++++
 xz.spec    | 22 ++++++++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/xz.changes b/xz.changes
index 236ba5c..af01f23 100644
--- a/xz.changes
+++ b/xz.changes
@@ -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
 
diff --git a/xz.spec b/xz.spec
index 2303f4b..bd05d80 100644
--- a/xz.spec
+++ b/xz.spec
@@ -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
+License:        LGPL-2.1+
 Group:          Productivity/Archiving/Compression
-License:        LGPLv2.1+
+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 @@ The xz command is a very powerful program for compressing files.
 %{?lang_package}
 
 %package -n liblzma5
-License:        LGPLv2.1+
 Summary:        LZMA library
 Group:          System/Libraries
 
@@ -73,7 +71,6 @@ Group:          System/Libraries
 Library for encoding/decoding LZMA files.
 
 %package devel
-License:        LGPLv2.1+
 Summary:        Development package for the LZMA library
 Group:          Development/Libraries/C and C++
 Requires:       liblzma5 = %{version}
@@ -95,13 +92,13 @@ profiledir=$(mktemp -d)
 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 @@ time make check
 
 %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 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %files -n liblzma5
 %defattr(-, root, root)
-/%{_lib}/lib*.so.5*
+%{_libdir}/lib*.so.5*
 
 %files devel
 %defattr(-, root, root)