From da419372ef0680d0c540c278c9f1180bfbe84f231fc3173a17ac71ef1f428754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 23 May 2014 15:44:38 +0000 Subject: [PATCH 1/4] Remove superfluous build requirement to pkg-config from the main package. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=45 --- ldb.changes | 5 +++++ ldb.spec | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ldb.changes b/ldb.changes index 91deb02..0da3e8d 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 23 15:39:36 UTC 2014 - lmuelle@suse.com + +- Remove superfluous build requirement to pkg-config from the main package. + ------------------------------------------------------------------- Mon May 5 11:38:58 UTC 2014 - lmuelle@suse.com diff --git a/ldb.spec b/ldb.spec index 937c5bc..0ab048f 100644 --- a/ldb.spec +++ b/ldb.spec @@ -60,11 +60,6 @@ Ldb is an LDAP-like embedded database. %package -n %{libldb_name} Summary: An LDAP-like embedded database Group: System/Libraries -%if 0%{?suse_version} > 1020 -BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif PreReq: /sbin/ldconfig %description -n %{libldb_name} From f84dc5b3acf46e0f4cb8d02e54f72a7d08a814b49972811f083751a9df221c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 23 May 2014 15:59:27 +0000 Subject: [PATCH 2/4] Require pkg-config from the devel sub packages and not from the main one. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=46 --- ldb.changes | 2 +- ldb.spec | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ldb.changes b/ldb.changes index 0da3e8d..e3e52c3 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri May 23 15:39:36 UTC 2014 - lmuelle@suse.com -- Remove superfluous build requirement to pkg-config from the main package. +- Require pkg-config from the devel sub packages and not from the main one. ------------------------------------------------------------------- Mon May 5 11:38:58 UTC 2014 - lmuelle@suse.com diff --git a/ldb.spec b/ldb.spec index 0ab048f..9454bc8 100644 --- a/ldb.spec +++ b/ldb.spec @@ -72,6 +72,11 @@ This package includes the ldb1 library. Summary: Libraries and Header Files to Develop Programs with ldb1 Support Group: Development/Libraries/C and C++ Requires: %{libldb_name} = %{version} +%if 0%{?suse_version} > 1020 +Requires: pkg-config +%else +Requires: pkgconfig +%endif %description -n libldb-devel Ldb is an LDAP-like embedded database. @@ -101,6 +106,11 @@ This package contains the python bindings for the LDB library. Summary: Development files for the Python bindings for the LDB library Group: Development/Libraries/Python Requires: pyldb = %{version} +%if 0%{?suse_version} > 1020 +Requires: pkg-config +%else +Requires: pkgconfig +%endif %description -n pyldb-devel This package contains the development files for the Python bindings for the From 12405bfabd6ae259360cb91586da1ae81ac78d3874535c20afa009ba5ddb126f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 23 May 2014 21:53:29 +0000 Subject: [PATCH 3/4] Require pkg-config from the devel sub packages and do not BuildRequire it from libldb1. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=47 --- ldb.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ldb.changes b/ldb.changes index e3e52c3..24196b8 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Fri May 23 15:39:36 UTC 2014 - lmuelle@suse.com -- Require pkg-config from the devel sub packages and not from the main one. +- Require pkg-config from the devel sub packages and do not BuildRequire it + from libldb1. ------------------------------------------------------------------- Mon May 5 11:38:58 UTC 2014 - lmuelle@suse.com From 72d1838f7fa8b4efdb21feb3839986bddebcc4ad1d515b588ee3639cc7b90502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 24 May 2014 12:58:47 +0000 Subject: [PATCH 4/4] Use plain libldb instead of the name including the major version. That's how we handled it with tdb too. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=48 --- ldb.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldb.changes b/ldb.changes index 24196b8..15fa9e5 100644 --- a/ldb.changes +++ b/ldb.changes @@ -2,7 +2,7 @@ Fri May 23 15:39:36 UTC 2014 - lmuelle@suse.com - Require pkg-config from the devel sub packages and do not BuildRequire it - from libldb1. + from libldb. ------------------------------------------------------------------- Mon May 5 11:38:58 UTC 2014 - lmuelle@suse.com