From 93106f4e37a0715bc3772d7a5efd5ab75b412383ce8c0bbc58509a021e95b3db Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 4 Jan 2011 13:30:33 +0000 Subject: [PATCH 1/4] prepare_spec OBS-URL: https://build.opensuse.org/package/show/network:ldap/ding-libs?expand=0&rev=6 --- ding-libs.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ding-libs.spec b/ding-libs.spec index fd243a8..da6148b 100644 --- a/ding-libs.spec +++ b/ding-libs.spec @@ -1,7 +1,7 @@ # # spec file for package ding-libs (Version 0.1.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -24,7 +24,7 @@ Name: ding-libs Version: 0.1.2 -Release: 1 +Release: 0 Summary: "Ding is not GLib" assorted utility libraries Group: Development/Libraries/C and C++ License: LGPLv3+ @@ -55,7 +55,7 @@ Summary: Filesystem Path Utilities Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{path_utils_version} -Release: 1 +Release: 0 %description -n libpath_utils1 Utility functions to manipulate filesystem pathnames @@ -66,7 +66,7 @@ Group: Development/Libraries/C and C++ Requires: libpath_utils1 = %{path_utils_version} License: LGPLv3+ Version: %{path_utils_version} -Release: 1 +Release: 0 %description -n libpath_utils-devel Utility functions to manipulate filesystem pathnames @@ -98,7 +98,7 @@ Group: Development/Libraries/C and C++ Summary: Dynamic hash table License: LGPLv3+ Version: %{dhash_version} -Release: 1 +Release: 0 %description -n libdhash1 A hash table which will dynamically resize to achieve optimal storage & access @@ -110,7 +110,7 @@ Group: Development/Libraries/C and C++ Requires: libdhash1 = %{dhash_version} License: LGPLv3+ Version: %{dhash_version} -Release: 1 +Release: 0 %description -n libdhash-devel A hash table which will dynamically resize to achieve optimal storage & access @@ -143,7 +143,7 @@ Summary: Collection data-type for C Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{collection_version} -Release: 1 +Release: 0 %description -n libcollection2 A data-type to collect data in a hierarchical structure for easy iteration @@ -155,7 +155,7 @@ Group: Development/Libraries/C and C++ License: LGPLv3+ 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 @@ -190,7 +190,7 @@ Summary: A refcounted array for C Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{ref_array_version} -Release: 1 +Release: 0 %description -n libref_array1 A dynamically-growing, reference-counted array @@ -201,7 +201,7 @@ Group: Development/Libraries/C and C++ Requires: libref_array1 = %{ref_array_version} License: LGPLv3+ Version: %{ref_array_version} -Release: 1 +Release: 0 %description -n libref_array-devel A dynamically-growing, reference-counted array @@ -233,7 +233,7 @@ Summary: INI file parser for C Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{ini_config_version} -Release: 1 +Release: 0 %description -n libini_config2 Library to process config files in INI format into a libcollection data @@ -245,7 +245,7 @@ Group: Development/Libraries/C and C++ License: LGPLv3+ 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 From 3649b24335b81a514fbc5f6d2f2b15f3f58f12560a0268f8bb62cab6b2c5180f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 4 Jan 2011 13:35:21 +0000 Subject: [PATCH 2/4] - remove release tag in subpackages OBS-URL: https://build.opensuse.org/package/show/network:ldap/ding-libs?expand=0&rev=7 --- ding-libs.changes | 5 +++++ ding-libs.spec | 14 ++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/ding-libs.changes b/ding-libs.changes index 4e8007d..c17bed1 100644 --- a/ding-libs.changes +++ b/ding-libs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 4 13:34:42 UTC 2011 - coolo@novell.com + +- remove release tag in subpackages + ------------------------------------------------------------------- Fri Nov 19 13:03:39 UTC 2010 - rhafer@novell.com diff --git a/ding-libs.spec b/ding-libs.spec index da6148b..2866ae9 100644 --- a/ding-libs.spec +++ b/ding-libs.spec @@ -1,7 +1,7 @@ # # spec file for package ding-libs (Version 0.1.2) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -24,7 +24,7 @@ Name: ding-libs Version: 0.1.2 -Release: 0 +Release: 1 Summary: "Ding is not GLib" assorted utility libraries Group: Development/Libraries/C and C++ License: LGPLv3+ @@ -55,7 +55,6 @@ Summary: Filesystem Path Utilities Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{path_utils_version} -Release: 0 %description -n libpath_utils1 Utility functions to manipulate filesystem pathnames @@ -66,7 +65,6 @@ Group: Development/Libraries/C and C++ Requires: libpath_utils1 = %{path_utils_version} License: LGPLv3+ Version: %{path_utils_version} -Release: 0 %description -n libpath_utils-devel Utility functions to manipulate filesystem pathnames @@ -98,7 +96,6 @@ Group: Development/Libraries/C and C++ Summary: Dynamic hash table License: LGPLv3+ Version: %{dhash_version} -Release: 0 %description -n libdhash1 A hash table which will dynamically resize to achieve optimal storage & access @@ -110,7 +107,6 @@ Group: Development/Libraries/C and C++ Requires: libdhash1 = %{dhash_version} License: LGPLv3+ Version: %{dhash_version} -Release: 0 %description -n libdhash-devel A hash table which will dynamically resize to achieve optimal storage & access @@ -143,7 +139,6 @@ Summary: Collection data-type for C Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{collection_version} -Release: 0 %description -n libcollection2 A data-type to collect data in a hierarchical structure for easy iteration @@ -155,7 +150,6 @@ Group: Development/Libraries/C and C++ License: LGPLv3+ Requires: libcollection2 = %{collection_version} Version: %{collection_version} -Release: 0 %description -n libcollection-devel A data-type to collect data in a hierarchical structure for easy iteration @@ -190,7 +184,6 @@ Summary: A refcounted array for C Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{ref_array_version} -Release: 0 %description -n libref_array1 A dynamically-growing, reference-counted array @@ -201,7 +194,6 @@ Group: Development/Libraries/C and C++ Requires: libref_array1 = %{ref_array_version} License: LGPLv3+ Version: %{ref_array_version} -Release: 0 %description -n libref_array-devel A dynamically-growing, reference-counted array @@ -233,7 +225,6 @@ Summary: INI file parser for C Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{ini_config_version} -Release: 0 %description -n libini_config2 Library to process config files in INI format into a libcollection data @@ -245,7 +236,6 @@ Group: Development/Libraries/C and C++ License: LGPLv3+ Requires: libini_config2 = %{ini_config_version} Version: %{ini_config_version} -Release: 0 %description -n libini_config-devel Library to process config files in INI format into a libcollection data From 9e49576eb5a77541ed82cbda0eb6a90b127c5595fd2775dc36ffdc0de170e9f9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 10 Jan 2011 11:31:28 +0000 Subject: [PATCH 3/4] revert OBS-URL: https://build.opensuse.org/package/show/network:ldap/ding-libs?expand=0&rev=8 --- ding-libs.changes | 5 ----- ding-libs.spec | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ding-libs.changes b/ding-libs.changes index c17bed1..4e8007d 100644 --- a/ding-libs.changes +++ b/ding-libs.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Jan 4 13:34:42 UTC 2011 - coolo@novell.com - -- remove release tag in subpackages - ------------------------------------------------------------------- Fri Nov 19 13:03:39 UTC 2010 - rhafer@novell.com diff --git a/ding-libs.spec b/ding-libs.spec index 2866ae9..fd243a8 100644 --- a/ding-libs.spec +++ b/ding-libs.spec @@ -55,6 +55,7 @@ Summary: Filesystem Path Utilities Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{path_utils_version} +Release: 1 %description -n libpath_utils1 Utility functions to manipulate filesystem pathnames @@ -65,6 +66,7 @@ Group: Development/Libraries/C and C++ Requires: libpath_utils1 = %{path_utils_version} License: LGPLv3+ Version: %{path_utils_version} +Release: 1 %description -n libpath_utils-devel Utility functions to manipulate filesystem pathnames @@ -96,6 +98,7 @@ Group: Development/Libraries/C and C++ Summary: Dynamic hash table License: LGPLv3+ Version: %{dhash_version} +Release: 1 %description -n libdhash1 A hash table which will dynamically resize to achieve optimal storage & access @@ -107,6 +110,7 @@ Group: Development/Libraries/C and C++ Requires: libdhash1 = %{dhash_version} License: LGPLv3+ Version: %{dhash_version} +Release: 1 %description -n libdhash-devel A hash table which will dynamically resize to achieve optimal storage & access @@ -139,6 +143,7 @@ Summary: Collection data-type for C Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{collection_version} +Release: 1 %description -n libcollection2 A data-type to collect data in a hierarchical structure for easy iteration @@ -150,6 +155,7 @@ Group: Development/Libraries/C and C++ License: LGPLv3+ Requires: libcollection2 = %{collection_version} Version: %{collection_version} +Release: 1 %description -n libcollection-devel A data-type to collect data in a hierarchical structure for easy iteration @@ -184,6 +190,7 @@ Summary: A refcounted array for C Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{ref_array_version} +Release: 1 %description -n libref_array1 A dynamically-growing, reference-counted array @@ -194,6 +201,7 @@ Group: Development/Libraries/C and C++ Requires: libref_array1 = %{ref_array_version} License: LGPLv3+ Version: %{ref_array_version} +Release: 1 %description -n libref_array-devel A dynamically-growing, reference-counted array @@ -225,6 +233,7 @@ Summary: INI file parser for C Group: Development/Libraries/C and C++ License: LGPLv3+ Version: %{ini_config_version} +Release: 1 %description -n libini_config2 Library to process config files in INI format into a libcollection data @@ -236,6 +245,7 @@ Group: Development/Libraries/C and C++ License: LGPLv3+ Requires: libini_config2 = %{ini_config_version} Version: %{ini_config_version} +Release: 1 %description -n libini_config-devel Library to process config files in INI format into a libcollection data From ef62b4e35260ef10058c96a60c502a2b8640e7176a280ef0418e1d47d8f5dea0 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Thu, 22 Sep 2011 09:29:50 +0000 Subject: [PATCH 4/4] Accepting request 83258 from home:jengelh:bl-d - Remove redundant tags/sections from specfile (cf. packaging guidelines) - Use %_smp_mflags for parallel build - Implement baselibs config OBS-URL: https://build.opensuse.org/request/show/83258 OBS-URL: https://build.opensuse.org/package/show/network:ldap/ding-libs?expand=0&rev=9 --- baselibs.conf | 20 ++++++++++++++++++++ ding-libs.changes | 8 ++++++++ ding-libs.spec | 11 ++++------- 3 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..676264d --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,20 @@ +libpath_utils1 +libpath_utils-devel + requires -libpath_utils- + requires "libpath_utils1- = " +libdhash1 +libdhash-devel + requires -libdhash- + requires "libdhash1- = " +libcollection2 +libcollection-devel + requires -libcollection- + requires "libcollection2- = " +libref_array1 +libref_array-devel + requires -libref_array- + requires "libref_array1- = " +libini_config2 +libini_config-devel + requires -libini_config- + requires "libini_config2- = " diff --git a/ding-libs.changes b/ding-libs.changes index 4e8007d..f99842b 100644 --- a/ding-libs.changes +++ b/ding-libs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + (cf. packaging guidelines) +- Use %_smp_mflags for parallel build +- Implement baselibs config + ------------------------------------------------------------------- Fri Nov 19 13:03:39 UTC 2010 - rhafer@novell.com diff --git a/ding-libs.spec b/ding-libs.spec index fd243a8..c1528e8 100644 --- a/ding-libs.spec +++ b/ding-libs.spec @@ -1,7 +1,7 @@ # -# spec file for package ding-libs (Version 0.1.2) +# spec file for package ding-libs # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -30,6 +30,7 @@ Group: Development/Libraries/C and C++ License: LGPLv3+ Url: http://fedorahosted.org/sssd/ Source0: %{name}-%{version}.tar.bz2 +Source2: baselibs.conf Patch0: doxygen-notimestamp.dif Patch1: Fix-license-text-for-several-files-that-should-be-LGPLv3+.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -281,14 +282,12 @@ structure %configure \ --disable-static -make %{?jobs:-j%jobs} all docs +make %{?_smp_mflags} all docs %check make %{?_smp_mflags} check %install -rm -rf $RPM_BUILD_ROOT - make install DESTDIR=$RPM_BUILD_ROOT # Remove .la files created by libtool @@ -305,6 +304,4 @@ rm -f \ # Remove document install script. RPM is handling this rm -f */doc/html/installdox -%clean -rm -rf $RPM_BUILD_ROOT %changelog