From 6cd011dbeab1afa47ed2c3885b7121777fa81fd9b8446c7fc773ffb5aa284969 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 1 Dec 2010 02:28:41 +0000 Subject: [PATCH 1/3] Update to libHX 3.7 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libHX?expand=0&rev=14 --- libHX-3.6.tar.xz | 3 --- libHX-3.6.tar.xz.asc | 7 ------- libHX-3.7.tar.xz | 3 +++ libHX-3.7.tar.xz.asc | 7 +++++++ libHX.changes | 8 ++++++++ libHX.spec | 13 +++++-------- 6 files changed, 23 insertions(+), 18 deletions(-) delete mode 100644 libHX-3.6.tar.xz delete mode 100644 libHX-3.6.tar.xz.asc create mode 100644 libHX-3.7.tar.xz create mode 100644 libHX-3.7.tar.xz.asc diff --git a/libHX-3.6.tar.xz b/libHX-3.6.tar.xz deleted file mode 100644 index 90fcb24..0000000 --- a/libHX-3.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be2ba98cc8facecc42dbea2fa057745c8a48dd495d5743496efff9646c531410 -size 768212 diff --git a/libHX-3.6.tar.xz.asc b/libHX-3.6.tar.xz.asc deleted file mode 100644 index 00937b2..0000000 --- a/libHX-3.6.tar.xz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.12 (GNU/Linux) - -iEYEABECAAYFAkxpd00ACgkQ92gFgoRMQ2CR0ACfc4JqAstJrsr0IsAz5bj/H4aL -iW4AmwSc08Y4fxQYASSeAIag7sVJxJ6+ -=LCaZ ------END PGP SIGNATURE----- diff --git a/libHX-3.7.tar.xz b/libHX-3.7.tar.xz new file mode 100644 index 0000000..e00b876 --- /dev/null +++ b/libHX-3.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc90db3d5bc6cd62f0dd4633cc5834c911598ef8d0d8e952301344e7e90f0a37 +size 780572 diff --git a/libHX-3.7.tar.xz.asc b/libHX-3.7.tar.xz.asc new file mode 100644 index 0000000..799ac81 --- /dev/null +++ b/libHX-3.7.tar.xz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEABECAAYFAkz1rEQACgkQ92gFgoRMQ2DXNACfXp7RCfZ239DSvc72QHT4j5Up +CZAAn2LF6YdZHeHv+C43tx7w1pQN4vw/ +=Csa/ +-----END PGP SIGNATURE----- diff --git a/libHX.changes b/libHX.changes index 90a8b8e..0b7284e 100644 --- a/libHX.changes +++ b/libHX.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 1 02:01:41 UTC 2010 - jengelh@medozas.de + +- Update to new upstream release 3.7 +* HXdir_{open,read,close} now work with struct HXdir * + instead of void * +* xml_newnode prototype changed to accomodate subtext + ------------------------------------------------------------------- Wed Aug 25 21:44:17 UTC 2010 - jengelh@medozas.de diff --git a/libHX.spec b/libHX.spec index 2720b77..70d405d 100644 --- a/libHX.spec +++ b/libHX.spec @@ -1,5 +1,5 @@ # -# spec file for package libHX (Version 3.6) +# spec file for package libHX (Version 3.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,10 +22,9 @@ Name: libHX %define lname libHX25 BuildRequires: gcc-c++ xz Summary: Useful collection of routines for C and C++ programming -Version: 3.6 -Release: 1 +Version: 3.7 +Release: 0 License: LGPL v2+ -Prefix: /usr Group: System/Libraries Source: http://downloads.sf.net/libhx/libHX-%version.tar.xz Source3: http://downloads.sf.net/libhx/libHX-%version.tar.xz.asc @@ -104,8 +103,6 @@ if [ ! -e configure ]; then fi %configure make %{?_smp_mflags} -perl -i -pe 's/^shouldnotlink=yes/shouldnotlink=no/;' \ - src/%{name}.la src/.libs/%{name}.lai; %install make install DESTDIR=${RPM_BUILD_ROOT} docdir=%{_defaultdocdir}/%{name} @@ -122,11 +119,11 @@ make check %postun -n %{lname} -p /sbin/ldconfig %files -n %{lname} -%defattr(-, root, root) +%defattr(-,root,root) /%_libdir/%{name}*.so.* %files devel -%defattr(-, root, root) +%defattr(-,root,root) %docdir %_docdir/%name %_docdir/%name %_includedir/%{name}* From 84f8abe6ec04261255c82dcb6871079fd3e1ce6ac45260dec0b86f863a919f5f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 1 Dec 2010 02:54:02 +0000 Subject: [PATCH 2/3] Run spec-beautifier OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libHX?expand=0&rev=15 --- libHX.changes | 1 + libHX.spec | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) 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 From 65952ff5e33ce9482211604dec3945ef2d684833c84a401388550431c682e25b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 1 Dec 2010 20:48:48 +0000 Subject: [PATCH 3/3] Update to 3.8 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libHX?expand=0&rev=16 --- libHX-3.7.tar.xz | 3 --- libHX-3.7.tar.xz.asc | 7 ------- libHX-3.8.tar.xz | 3 +++ libHX-3.8.tar.xz.asc | 7 +++++++ libHX.changes | 4 ++-- libHX.spec | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 libHX-3.7.tar.xz delete mode 100644 libHX-3.7.tar.xz.asc create mode 100644 libHX-3.8.tar.xz create mode 100644 libHX-3.8.tar.xz.asc diff --git a/libHX-3.7.tar.xz b/libHX-3.7.tar.xz deleted file mode 100644 index e00b876..0000000 --- a/libHX-3.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc90db3d5bc6cd62f0dd4633cc5834c911598ef8d0d8e952301344e7e90f0a37 -size 780572 diff --git a/libHX-3.7.tar.xz.asc b/libHX-3.7.tar.xz.asc deleted file mode 100644 index 799ac81..0000000 --- a/libHX-3.7.tar.xz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEABECAAYFAkz1rEQACgkQ92gFgoRMQ2DXNACfXp7RCfZ239DSvc72QHT4j5Up -CZAAn2LF6YdZHeHv+C43tx7w1pQN4vw/ -=Csa/ ------END PGP SIGNATURE----- diff --git a/libHX-3.8.tar.xz b/libHX-3.8.tar.xz new file mode 100644 index 0000000..7ca3d33 --- /dev/null +++ b/libHX-3.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54381e45549141140496612a031023617bd4a93595595e569145c9996c6f7699 +size 781076 diff --git a/libHX-3.8.tar.xz.asc b/libHX-3.8.tar.xz.asc new file mode 100644 index 0000000..647b343 --- /dev/null +++ b/libHX-3.8.tar.xz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEABECAAYFAkz2qksACgkQ92gFgoRMQ2C1ugCfb92JatpPhUo6fkFBDwASX16Q +F+cAmwUFm2lTSIyYpCZVl6qITqgL24VI +=drzu +-----END PGP SIGNATURE----- diff --git a/libHX.changes b/libHX.changes index 6d59903..c629683 100644 --- a/libHX.changes +++ b/libHX.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Wed Dec 1 02:01:41 UTC 2010 - jengelh@medozas.de +Wed Dec 1 20:48:36 UTC 2010 - jengelh@medozas.de -- Update to new upstream release 3.7 +- Update to new upstream release 3.8 * HXdir_{open,read,close} now work with struct HXdir * instead of void * * xml_newnode prototype changed to accomodate subtext diff --git a/libHX.spec b/libHX.spec index 14eee52..5031ee0 100644 --- a/libHX.spec +++ b/libHX.spec @@ -1,5 +1,5 @@ # -# spec file for package libHX (Version 3.7) +# spec file for package libHX (Version 3.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ Name: libHX %define lname libHX25 BuildRequires: gcc-c++, xz Summary: Useful collection of routines for C and C++ programming -Version: 3.7 +Version: 3.8 Release: 0 License: LGPL v2+ Group: System/Libraries