diff --git a/libHX.changes b/libHX.changes index 0b7284e..6d59903 100644 --- a/libHX.changes +++ b/libHX.changes @@ -5,6 +5,7 @@ Wed Dec 1 02:01:41 UTC 2010 - jengelh@medozas.de * HXdir_{open,read,close} now work with struct HXdir * instead of void * * xml_newnode prototype changed to accomodate subtext +- Run hxtools's spec-beautifier on specfile ------------------------------------------------------------------- Wed Aug 25 21:44:17 UTC 2010 - jengelh@medozas.de diff --git a/libHX.spec b/libHX.spec index 70d405d..14eee52 100644 --- a/libHX.spec +++ b/libHX.spec @@ -20,7 +20,7 @@ Name: libHX %define lname libHX25 -BuildRequires: gcc-c++ xz +BuildRequires: gcc-c++, xz Summary: Useful collection of routines for C and C++ programming Version: 3.7 Release: 0 @@ -29,9 +29,9 @@ Group: System/Libraries Source: http://downloads.sf.net/libhx/libHX-%version.tar.xz Source3: http://downloads.sf.net/libhx/libHX-%version.tar.xz.asc Source2: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define debug_package_requires %lname = %{version}-%{release} -Url: http://libhx.sf.net/ +BuildRoot: %_tmppath/%name-%version-build +%define debug_package_requires %lname = %version-%release +URL: http://libhx.sf.net/ %description A library for: @@ -55,7 +55,7 @@ License: LGPL v2+ Summary: Useful collection of routines for C and C++ programming Group: System/Libraries -%description -n %{lname} +%description -n %lname A library for: - hash/rbtree-based maps/sets - double-ended queues (stacks/fifos/lists) @@ -76,7 +76,7 @@ Authors: License: LGPL v2+ Summary: Useful collection of routines for C and C++ programming Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: %lname = %version %description devel A library for: @@ -105,20 +105,20 @@ fi make %{?_smp_mflags} %install -make install DESTDIR=${RPM_BUILD_ROOT} docdir=%{_defaultdocdir}/%{name} -mkdir -p "${RPM_BUILD_ROOT}/%_docdir"; -install -pm0644 doc/* "${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}" -rm -f ${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}/Makefile* -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/%{name}.la +make install DESTDIR=%buildroot docdir=%_defaultdocdir/%name +mkdir -p "%buildroot/%_docdir"; +install -pm0644 doc/* "%buildroot/%_defaultdocdir/%name" +rm -f %buildroot/%_defaultdocdir/%name/Makefile* +rm -f %buildroot/%_libdir/%name.la %check make check -%post -n %{lname} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files -n %{lname} +%files -n %lname %defattr(-,root,root) /%_libdir/%{name}*.so.* @@ -127,7 +127,7 @@ make check %docdir %_docdir/%name %_docdir/%name %_includedir/%{name}* -/%{_libdir}/%{name}*.so +/%_libdir/%{name}*.so %_libdir/pkgconfig/*.pc %changelog