From 1d8dc32b24a8d6ea3e0e19307d5441ba8a4d2beaefe3c7d7a1f43778ac0cb066 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:38 +0000
Subject: [PATCH] Accepting request 104180 from home:elvigia:branches:Archiving

- Put libraries back into %{_libdir}, /usr merge project.

OBS-URL: https://build.opensuse.org/request/show/104180
OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=30
---
 bzip2.changes |  5 +++++
 bzip2.spec    | 17 ++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bzip2.changes b/bzip2.changes
index b422c79..d41c82e 100644
--- a/bzip2.changes
+++ b/bzip2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Feb 12 23:00:21 UTC 2012 - crrodriguez@opensuse.org
+
+- Put libraries back into %{_libdir}, /usr merge project. 
+
 -------------------------------------------------------------------
 Thu Jan 26 09:38:00 UTC 2012 - sitter@kde.org
 
diff --git a/bzip2.spec b/bzip2.spec
index ef151be..8dfd6aa 100644
--- a/bzip2.spec
+++ b/bzip2.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           bzip2
 Version:        1.0.6
 Release:        0
@@ -95,9 +96,7 @@ autoreconf -fiv
 %if %{do_profiling}
 export CFLAGS="$RPM_OPT_FLAGS %{cflags_profile_generate}"
 %endif
-%configure\
-	--libdir=/%{_lib}\
-	--disable-static
+%configure --with-pic --disable-static
 %if %{do_profiling}
 make %{?_smp_mflags}
 profile_bzip2
@@ -106,21 +105,17 @@ mv .libs/*.gcda .libs.save/
 make clean
 mv .libs.save .libs
 export CFLAGS="$RPM_OPT_FLAGS %{cflags_profile_feedback}"
-%configure \
-	--libdir=/%{_lib}\
-	--disable-static
+%configure --with-pic --disable-static
 %endif
 make %{?_smp_mflags}
 
 %install
 %makeinstall pkgconfigdir=%{_libdir}/pkgconfig
-rm $RPM_BUILD_ROOT/%{_lib}/libbz2.so $RPM_BUILD_ROOT/%{_lib}/libbz2.la
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/libbz2.so.1 $RPM_BUILD_ROOT%{_libdir}/libbz2.so
 gzip -9 manual.ps
 gzip -dc %{SOURCE1} > bznew
 install -D -m 755 bznew $RPM_BUILD_ROOT%{_bindir}/bznew
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
+rm -vf %{buildroot}%{_libdir}/*.la
 
 %post -n libbz2-1 -p /sbin/ldconfig
 
@@ -137,8 +132,8 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
 
 %files -n libbz2-1
 %defattr(-,root,root)
-/%{_lib}/libbz2.so.1
-/%{_lib}/libbz2.so.1.*
+%{_libdir}/libbz2.so.1
+%{_libdir}/libbz2.so.1.*
 
 %files -n libbz2-devel
 %defattr(-,root,root)