From 899581d98b16146fcea1060df7e30b633f732759374de04fc5929fed74e8491a Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 27 Jul 2007 13:34:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/expat?expand=0&rev=4

---
 expat.changes |  6 ++++++
 expat.spec    | 23 +++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/expat.changes b/expat.changes
index 814ae7f..b33d5e9 100644
--- a/expat.changes
+++ b/expat.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul 25 11:29:59 CEST 2007 - prusnak@suse.cz
+
+- move libraries from /usr/lib to /lib [#285472]
+- replace deprecated %run_ldconfig with /sbin/ldconfig
+
 -------------------------------------------------------------------
 Thu Jun  7 16:46:32 CEST 2007 - prusnak@suse.cz
 
diff --git a/expat.spec b/expat.spec
index 88eea8d..fa16f73 100644
--- a/expat.spec
+++ b/expat.spec
@@ -12,7 +12,7 @@
 
 Name:           expat
 Version:        2.0.1
-Release:        1
+Release:        10
 Group:          Development/Libraries/C and C++
 License:        X11/MIT
 URL:            http://expat.sourceforge.net/
@@ -124,22 +124,30 @@ cp %{S:1} .
 rm -f examples/*.dsp
 
 %build
-%configure
+%configure \
+    --libdir=/%{_lib}
 make
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 rm doc/xmlwf.1
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libexpat.la
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+# move .a file to /usr
+mv $RPM_BUILD_ROOT/%{_lib}/libexpat.a $RPM_BUILD_ROOT%{_libdir}/libexpat.a
+# move .so symlink to /usr
+rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.so
+ln -sf /%{_lib}/libexpat.so.*.*.* $RPM_BUILD_ROOT%{_libdir}/libexpat.so
+# remove .la file
+rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post -n libexpat1
-%run_ldconfig
+/sbin/ldconfig
 
 %postun -n libexpat1
-%run_ldconfig
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root)
@@ -150,7 +158,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libexpat1
 %defattr(-, root, root)
-%{_libdir}/libexpat.so.*
+/%{_lib}/libexpat.so.*
 
 %files -n libexpat-devel
 %defattr(-, root, root)
@@ -159,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libexpat.so
 
 %changelog
+* Wed Jul 25 2007 - prusnak@suse.cz
+- move libraries from /usr/lib to /lib [#285472]
+- replace deprecated %%run_ldconfig with /sbin/ldconfig
 * Thu Jun 07 2007 - prusnak@suse.cz
 - update to 2.0.1:
   ( from Changes )