diff --git a/Fix-license-text-for-several-files-that-should-be-LGPLv3+.patch b/Fix-license-text-for-several-files-that-should-be-LGPLv3+.patch deleted file mode 100644 index b37a21d..0000000 --- a/Fix-license-text-for-several-files-that-should-be-LGPLv3+.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d7999c317e4823b953e635061011567a9838a9fa Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Fri, 19 Nov 2010 07:54:06 -0500 -Subject: [PATCH] Fix license text for several files that should be LGPLv3+ - -This is NOT a relicensing. These files were mislabeled. They were -always LGPLv3+. ---- - refarray/ref_array.c | 4 ++-- - refarray/ref_array.h | 4 ++-- - trace/trace.h | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/refarray/ref_array.c b/refarray/ref_array.c -index a571804c0b00a6344b708e6bc30c351dd67712da..e9482de0a423f8b8b90ca434f6839e0c8b000603 100644 ---- a/refarray/ref_array.c -+++ b/refarray/ref_array.c -@@ -6,14 +6,14 @@ - Copyright (C) Dmitri Pal 2009 - - This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -+ it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -- You should have received a copy of the GNU General Public License -+ You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - */ - -diff --git a/refarray/ref_array.h b/refarray/ref_array.h -index 4b4b2de6b974decd2125fd8a3642d68e92b43d67..0040fe43f4e70eda9a1860129fc45d3e892a20d1 100644 ---- a/refarray/ref_array.h -+++ b/refarray/ref_array.h -@@ -6,14 +6,14 @@ - Copyright (C) Dmitri Pal 2009 - - This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -+ it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -- You should have received a copy of the GNU General Public License -+ You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - */ - -diff --git a/trace/trace.h b/trace/trace.h -index 9a7dd225c9a4bb72b063ce3c592554baac63d5bc..d42d3ac4fddcc58615c5e329d1b18b28a6198d71 100644 ---- a/trace/trace.h -+++ b/trace/trace.h -@@ -6,14 +6,14 @@ - Copyright (C) Dmitri Pal 2009 - - This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -+ it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -- You should have received a copy of the GNU General Public License -+ You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - */ - --- -1.7.3.2 - diff --git a/ding-libs-0.1.2.tar.bz2 b/ding-libs-0.1.2.tar.bz2 deleted file mode 100644 index 34bf264..0000000 --- a/ding-libs-0.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c57cbe26976a04b71849e7eb4ccb057a46203f43a89fa1b70498758bfb5e044e -size 409948 diff --git a/ding-libs-0.1.3.tar.bz2 b/ding-libs-0.1.3.tar.bz2 new file mode 100644 index 0000000..4d2aeee --- /dev/null +++ b/ding-libs-0.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c82047f19ac9caf198d4f9f4b1b6641266282c28fe85c3e341fff5c3d761eaca +size 407256 diff --git a/ding-libs.changes b/ding-libs.changes index f99842b..55b8fc7 100644 --- a/ding-libs.changes +++ b/ding-libs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Mar 11 19:24:54 UTC 2012 - jengelh@medozas.de + +- Update to new upstream release 0.1.3 +* Fixes a serious bug in libdhash with very large (>1024 slots) + initial size + ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de diff --git a/ding-libs.spec b/ding-libs.spec index 83096fa..f91357d 100644 --- a/ding-libs.spec +++ b/ding-libs.spec @@ -1,7 +1,7 @@ # # spec file for package ding-libs # -# 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 @@ -14,33 +14,34 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - -%global path_utils_version 0.2.1 -%global dhash_version 0.4.2 %global collection_version 0.6.0 -%global ref_array_version 0.1.1 +%global dhash_version 0.4.3 %global ini_config_version 0.6.1 +%global path_utils_version 0.2.1 +%global ref_array_version 0.1.1 Name: ding-libs -Version: 0.1.2 -Release: 1 +Version: 0.1.3 +Release: 0 Summary: "Ding is not GLib" assorted utility libraries -Group: Development/Libraries/C and C++ License: LGPL-3.0+ +Group: Development/Libraries/C and C++ Url: http://fedorahosted.org/sssd/ + +#DL-URL: https://fedorahosted.org/sssd/wiki/Releases +#Git-Clone: git://git.fedorahosted.org/ding-libs Source0: %{name}-%{version}.tar.bz2 Source2: baselibs.conf Patch0: doxygen-notimestamp.dif -Patch1: Fix-license-text-for-several-files-that-should-be-LGPLv3+.patch +Patch1: pkgconfig-deps.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ### Build Dependencies ### BuildRequires: autoconf BuildRequires: automake +BuildRequires: doxygen BuildRequires: libtool BuildRequires: m4 -BuildRequires: doxygen BuildRequires: pkg-config %description @@ -53,10 +54,9 @@ librefarray and libpath_utils. %package -n libpath_utils1 Summary: Filesystem Path Utilities -Group: Development/Libraries/C and C++ -License: LGPL-3.0+ +Group: System/Libraries Version: %{path_utils_version} -Release: 1 +Release: 0 %description -n libpath_utils1 Utility functions to manipulate filesystem pathnames @@ -65,9 +65,8 @@ Utility functions to manipulate filesystem pathnames Summary: Development files for libpath_utils Group: Development/Libraries/C and C++ Requires: libpath_utils1 = %{path_utils_version} -License: LGPL-3.0+ Version: %{path_utils_version} -Release: 1 +Release: 0 %description -n libpath_utils-devel Utility functions to manipulate filesystem pathnames @@ -95,11 +94,10 @@ Utility functions to manipulate filesystem pathnames ############################################################################## %package -n libdhash1 -Group: Development/Libraries/C and C++ Summary: Dynamic hash table -License: LGPL-3.0+ +Group: System/Libraries Version: %{dhash_version} -Release: 1 +Release: 0 %description -n libdhash1 A hash table which will dynamically resize to achieve optimal storage & access @@ -109,9 +107,8 @@ time properties Summary: Development files for libdhash Group: Development/Libraries/C and C++ Requires: libdhash1 = %{dhash_version} -License: LGPL-3.0+ Version: %{dhash_version} -Release: 1 +Release: 0 %description -n libdhash-devel A hash table which will dynamically resize to achieve optimal storage & access @@ -123,8 +120,7 @@ time properties %files -n libdhash1 %defattr(-,root,root,-) -%{_libdir}/libdhash.so.1 -%{_libdir}/libdhash.so.1.0.0 +%{_libdir}/libdhash.so.1* %files -n libdhash-devel %defattr(-,root,root,-) @@ -141,10 +137,9 @@ time properties %package -n libcollection2 Summary: Collection data-type for C -Group: Development/Libraries/C and C++ -License: LGPL-3.0+ +Group: System/Libraries Version: %{collection_version} -Release: 1 +Release: 0 %description -n libcollection2 A data-type to collect data in a hierarchical structure for easy iteration @@ -153,10 +148,9 @@ and serialization %package -n libcollection-devel Summary: Development files for libcollection Group: Development/Libraries/C and C++ -License: LGPL-3.0+ Requires: libcollection2 = %{collection_version} Version: %{collection_version} -Release: 1 +Release: 0 %description -n libcollection-devel A data-type to collect data in a hierarchical structure for easy iteration @@ -188,10 +182,9 @@ and serialization %package -n libref_array1 Summary: A refcounted array for C -Group: Development/Libraries/C and C++ -License: LGPL-3.0+ +Group: System/Libraries Version: %{ref_array_version} -Release: 1 +Release: 0 %description -n libref_array1 A dynamically-growing, reference-counted array @@ -200,9 +193,8 @@ A dynamically-growing, reference-counted array Summary: Development files for libref_array Group: Development/Libraries/C and C++ Requires: libref_array1 = %{ref_array_version} -License: LGPL-3.0+ Version: %{ref_array_version} -Release: 1 +Release: 0 %description -n libref_array-devel A dynamically-growing, reference-counted array @@ -231,10 +223,9 @@ A dynamically-growing, reference-counted array %package -n libini_config2 Summary: INI file parser for C -Group: Development/Libraries/C and C++ -License: LGPL-3.0+ +Group: System/Libraries Version: %{ini_config_version} -Release: 1 +Release: 0 %description -n libini_config2 Library to process config files in INI format into a libcollection data @@ -243,10 +234,9 @@ structure %package -n libini_config-devel Summary: Development files for libini_config Group: Development/Libraries/C and C++ -License: LGPL-3.0+ Requires: libini_config2 = %{ini_config_version} Version: %{ini_config_version} -Release: 1 +Release: 0 %description -n libini_config-devel Library to process config files in INI format into a libcollection data @@ -275,8 +265,7 @@ structure %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P 0 -P 1 -p1 %build %configure \ diff --git a/pkgconfig-deps.diff b/pkgconfig-deps.diff new file mode 100644 index 0000000..f6bf722 --- /dev/null +++ b/pkgconfig-deps.diff @@ -0,0 +1,27 @@ +From: Jan Engelhardt +Date: 2012-03-12 00:18:26.252269956 +0100 + +build: resolve compile error + +ini_config.pc must Require collection, or linkage can fail: + +$ gcc tc.c $(pkg-config ini_config --libs) +ld: cannot find -lcollection +collect2: ld returned 1 exit status + +--- + ini/ini_config.pc.in | 1 + + 1 file changed, 1 insertion(+) + +Index: ding-libs-0.1.3/ini/ini_config.pc.in +=================================================================== +--- ding-libs-0.1.3.orig/ini/ini_config.pc.in ++++ ding-libs-0.1.3/ini/ini_config.pc.in +@@ -6,6 +6,7 @@ includedir=@includedir@ + Name: ini_config + Description: Library to process config files in INI format into a libcollection data structure + Version: @INI_CONFIG_VERSION@ ++Requires: collection + Libs: -L${libdir} -lini_config -lcollection + Cflags: -I${includedir} + URL: http://fedorahosted.org/sssd/