From d3ae64c4e9de0159443ae37b668d11e7305c8f01347d8cacd3af575519b64ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 4 Feb 2011 01:34:13 +0000
Subject: [PATCH] Accepting request 59747 from
 home:andreas_hanke:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/59747
OBS-URL: https://build.opensuse.org/package/show/Base:System/popt?expand=0&rev=23
---
 popt.changes |  8 ++++++++
 popt.spec    | 11 ++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/popt.changes b/popt.changes
index 7b06547..97da57a 100644
--- a/popt.changes
+++ b/popt.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb  2 08:35:00 UTC 2011 - andreas.hanke@gmx-topmail.de
+
+- don't build libpopt.a
+- move libpopt.so from /%{_lib} to %{_libdir} and fix popt.pc to have
+  libdir=%{_libdir} instead of libdir=/%{_lib}
+- don't list popt.mo files twice
+
 -------------------------------------------------------------------
 Sun Jan 16 14:25:52 UTC 2011 - coolo@novell.com
 
diff --git a/popt.spec b/popt.spec
index 1a858da..86dca3a 100644
--- a/popt.spec
+++ b/popt.spec
@@ -69,13 +69,15 @@ API documentation of the popt library, too.
 %setup -q
 
 %build
-%configure --libdir=/%{_lib}
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%_lib/libpopt.a
-rm -f $RPM_BUILD_ROOT/%_lib/libpopt.la
+rm $RPM_BUILD_ROOT%{_libdir}/libpopt.{la,so}
+install -d -m755 $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libpopt.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -s /%{_lib}/libpopt.so.0 $RPM_BUILD_ROOT%{_libdir}/libpopt.so
 %if "%{_libdir}" != "%{_prefix}/lib"
 install -d -m755 %{buildroot}/%{_libdir}/pkgconfig
 mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
@@ -93,12 +95,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc CHANGES COPYING
 /%{_lib}/libpopt.so.*
-/usr/share/locale/*/LC_MESSAGES/popt.mo
 
 %files devel
 %defattr(-,root,root)
 %doc README
-/%{_lib}/libpopt.so
+%{_libdir}/libpopt.so
 %{_includedir}/popt.h
 %{_mandir}/man3/popt.3*
 %{_libdir}/pkgconfig/popt.pc