diff --git a/libHX.changes b/libHX.changes index 0e21c75..91b70ee 100644 --- a/libHX.changes +++ b/libHX.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 29 15:38:19 CET 2009 - crrodriguez@suse.de + +- move .so symlinks to %%{_libdir} +- fix -devel package dependencies + ------------------------------------------------------------------- Wed Oct 22 16:17:19 CEST 2008 - mrueckert@suse.de diff --git a/libHX.spec b/libHX.spec index 0337134..8f076e3 100644 --- a/libHX.spec +++ b/libHX.spec @@ -1,7 +1,7 @@ # # spec file for package libHX (Version 1.23) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -23,9 +23,8 @@ Name: libHX BuildRequires: gcc-c++ libxml2-devel Summary: General-purpose Library Version: 1.23 -Release: 3 +Release: 4 License: LGPL v2.1 or later; LGPL v3 or later -Prefix: /usr Group: System/Libraries Source: %{name}-%{version}.tar.bz2 Patch1: libHX-hmc-fixes.dif @@ -64,7 +63,6 @@ Authors: License: LGPL v2.1 or later; LGPL v3 or later Summary: General-purpose Library Group: System/Libraries -#Requires: %{name} = %{version} %description -n %{lname} A library for: - A+R/B trees to use for lists or maps (associative @@ -98,7 +96,7 @@ Authors: License: LGPL v2.1 or later Summary: General-purpose library Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: %{lname} = %{version} libstdc++-devel libxml2-devel %description devel A library for: - A+R/B trees to use for lists or maps (associative @@ -133,7 +131,7 @@ Authors: %build ./autogen.sh; -%configure --libdir=/%_lib --with-pkgconfigdir=/%_libdir/pkgconfig/ +%configure --with-pic --libdir=/%_lib --with-pkgconfigdir=/%_libdir/pkgconfig/ make %{?jobs:-j%jobs}; perl -i -pe 's/^shouldnotlink=yes/shouldnotlink=no/;' \ src/%{name}.la src/.libs/%{name}.lai; @@ -143,6 +141,8 @@ make install DESTDIR=${RPM_BUILD_ROOT} mkdir -p "${RPM_BUILD_ROOT}/%_docdir"; cp -a doc "${RPM_BUILD_ROOT}/%_docdir/%name"; rm -f ${RPM_BUILD_ROOT}/%_lib/%{name}.la +%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so +%{__rm} -v %{buildroot}/%{_lib}/%{name}.so %clean rm -rf $RPM_BUILD_ROOT @@ -160,10 +160,13 @@ rm -rf $RPM_BUILD_ROOT %docdir %_docdir/%name %_docdir/%name %_includedir/%{name}* -/%_lib/%{name}*.so +%_libdir/%{name}*.so %_libdir/pkgconfig/*.pc %changelog +* Thu Jan 29 2009 crrodriguez@suse.de +- move .so symlinks to %%{_libdir} +- fix -devel package dependencies * Wed Oct 22 2008 mrueckert@suse.de - fix debug_packages_requires define * Thu Sep 25 2008 mc@suse.de