Accepting request 104138 from home:elvigia:branches:devel:libraries:c_c++

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

OBS-URL: https://build.opensuse.org/request/show/104138
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/expat?expand=0&rev=20

expat.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Feb 12 14:42:34 UTC 2012 - crrodriguez@opensuse.org
+
+- Put libraries back to %{_libdir}, /usr merge project 
+
 -------------------------------------------------------------------
 Fri Dec  2 12:43:19 UTC 2011 - coolo@suse.com
 

expat.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package expat
 #
-# 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
@@ -15,11 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           expat
 Version:        2.0.1
 Release:        0
-Group:          Development/Libraries/C and C++
-License:        MIT
 Url:            http://expat.sourceforge.net/
 # bug437293
 %ifarch ppc64
@@ -27,6 +26,8 @@ Obsoletes:      expat-64bit
 %endif
 #
 Summary:        XML Parser Toolkit
+License:        MIT
+Group:          Development/Libraries/C and C++
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}faq.html
 Source2:        baselibs.conf
@@ -35,8 +36,8 @@ Patch1:         %{name}-CVE-2009-3560.patch
 Patch2:         expat-visibility.patch
 Patch3:         expat-alloc-size.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  automake
 BuildRequires:  gcc-c++
+BuildRequires:  libtool
 
 %description
 Expat is an XML 1.0 parser written in C. It aims to be fully
@@ -63,6 +64,7 @@ declaration).
 
 %package -n libexpat1
 Summary:        XML Parser Toolkit
+Group:          Development/Libraries/C and C++
 # bug437293
 %ifarch ppc64
 Obsoletes:      expat-64bit
@@ -94,6 +96,7 @@ declaration).
 
 %package -n libexpat-devel
 Summary:        XML Parser Toolkit
+Group:          Development/Libraries/C and C++
 Requires:       libexpat1 = %{version} glibc-devel
 
 %description -n libexpat-devel
@@ -130,19 +133,14 @@ rm -f examples/*.dsp
 
 %build
 autoreconf
-%configure --disable-static --with-pic --libdir=/%{_lib}
+%configure --disable-static --with-pic
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 rm doc/xmlwf.1
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-# move .so symlink to /usr
-%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so
-%{__rm} -v %{buildroot}/%{_lib}/lib%{name}.so
 # remove .la file
-rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.la
-nm -C -D %{buildroot}/%{_lib}/libexpat.so.1 | wc -l
+rm -f %{buildroot}%{_libdir}/libexpat.la
 
 %check
 make check
@@ -160,7 +158,7 @@ make check
 
 %files -n libexpat1
 %defattr(-, root, root)
-/%{_lib}/libexpat.so.*
+%{_libdir}/libexpat.so.*
 
 %files -n libexpat-devel
 %defattr(-, root, root)