diff --git a/baselibs.conf b/baselibs.conf index b2ac326..1d22017 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libHX18 +libHX22 diff --git a/libHX-2.9.tar.bz2 b/libHX-2.9.tar.bz2 deleted file mode 100644 index bf55096..0000000 --- a/libHX-2.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9907c8066ac0a7199fad171671d52b5f202ba5989b398c60af3219fe57f38fde -size 811080 diff --git a/libHX-3.2.tar.bz2 b/libHX-3.2.tar.bz2 new file mode 100644 index 0000000..ee95448 --- /dev/null +++ b/libHX-3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03ae3ed25a7285aaf62e8a0dfe87aae9a8512db4719761316dba81abc364dc6e +size 829439 diff --git a/libHX.changes b/libHX.changes index de70c7e..a734ada 100644 --- a/libHX.changes +++ b/libHX.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Dec 9 21:34:17 CET 2009 - jengelh@medozas.de + +- update descriptions in specfile +- do not pass --with-pkgconfigdir to configure; + build already does it right +- update to upstream version 3.2 + * defs: add HXsizeof_member and HXtypeof_member + * map: new map API, with hash-based maps and classic + rbtree-based maps + * arbtree: HXbtree was removed in favor of the new HXmap + * clist: clist.h moved into list.h + * format: HXformat_* now uses struct HXformat_map + * rand: use faster modulo-based variant for numbers within + RAND_MAX range + * rand: use libc rand() almost exclusively, only use + /dev/urandom for seed + * time: add time delta functions + * added HXbitmap_* functions +- add baselibs.conf as a Source, so that it is available on local + builds too + ------------------------------------------------------------------- Mon Jul 27 11:10:51 CEST 2009 - mc@novell.com diff --git a/libHX.spec b/libHX.spec index d151ee0..16da262 100644 --- a/libHX.spec +++ b/libHX.spec @@ -1,5 +1,5 @@ # -# spec file for package libHX (Version 2.9) +# spec file for package libHX (Version 3.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,118 +19,86 @@ Name: libHX -%define lname libHX18 +%define lname libHX22 BuildRequires: gcc-c++ -Summary: General-purpose Library -Version: 2.9 +Summary: Useful collection of routines for programming +Version: 3.2 Release: 1 -License: LGPL v2.1 only ; LGPL v3 only +License: LGPL v2+ Prefix: /usr Group: System/Libraries Source: %{name}-%{version}.tar.bz2 +Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define debug_package_requires libHX18 = %{version}-%{release} +%define debug_package_requires %lname = %{version}-%{release} Url: http://libhx.sf.net/ %description -A library for: * A+R/B trees to use for lists or maps (associative - arrays) - -* Deques (double-ended queues) (Stacks (LIFO) / Queues (FIFOs)) - -* platform independent opendir-style directory access - -* platform independent dlopen-style shared library access - -* auto-storage strings with direct access - -* command line option (argv) parser - -* shell-style config file parser - -* platform independent random number generator with transparent - /dev/urandom support - -* various string, memory and zvec ops - - - -Authors: --------- - Jan Engelhardt - -%package -n libHX18 -License: LGPL v2.1 or later ; LGPL v3 or later -Summary: General-purpose Library -Group: System/Libraries - -%description -n %{lname} -A library for: - A+R/B trees to use for lists or maps (associative - arrays) - -- Deques (double-ended queues) (Stacks (LIFO) / Queues (FIFOs)) - -- platform independent opendir-style directory access - -- platform independent dlopen-style shared library access - +A library for: +- hash/rbtree-based maps/sets +- double-ended queues (stacks/fifos/lists) +- platform-independent opendir-style directory access +- platform-independent dlopen-style shared library access - auto-storage strings with direct access - - command line option (argv) parser - -- shell-style config file parser - -- platform independent random number generator with transparent - /dev/urandom support - +- shconfig-style config file parser - various string, memory and zvec ops +Authors: +-------- + Jan Engelhardt + +%package -n libHX22 +License: LGPL v2+ +Summary: Useful collection of routines for programming +Group: System/Libraries + +%description -n %{lname} +A library for: +- hash/rbtree-based maps/sets +- double-ended queues (stacks/fifos/lists) +- platform-independent opendir-style directory access +- platform-independent dlopen-style shared library access +- auto-storage strings with direct access +- command line option (argv) parser +- shconfig-style config file parser +- various string, memory and zvec ops + Authors: -------- - Jan Engelhardt + Jan Engelhardt %package devel -License: LGPL v2.1 or later -Summary: General-purpose library +License: LGPL v2+ +Summary: Useful collection of routines for programming Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} %description devel -A library for: - A+R/B trees to use for lists or maps (associative - arrays) - -- Deques (double-ended queues) (Stacks (LIFO) / Queues (FIFOs)) - -- platform independent opendir-style directory access - -- platform independent dlopen-style shared library access - +A library for: +- hash/rbtree-based maps/sets +- double-ended queues (stacks/fifos/lists) +- platform-independent opendir-style directory access +- platform-independent dlopen-style shared library access - auto-storage strings with direct access - - command line option (argv) parser - -- shell-style config file parser - -- platform independent random number generator with transparent - /dev/urandom support - +- shconfig-style config file parser - various string, memory and zvec ops - Authors: -------- - Jan Engelhardt + Jan Engelhardt %prep %setup -q -n %{name}-%{version} %build ./autogen.sh; -%configure --with-pkgconfigdir=/%_libdir/pkgconfig/ +%configure make %{?jobs:-j%jobs}; perl -i -pe 's/^shouldnotlink=yes/shouldnotlink=no/;' \ src/%{name}.la src/.libs/%{name}.lai;