From 6a9c43b569b1123ca81e659a4686e54e2da49928082036192d5bdcee50a574b4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Apr 2015 08:39:47 +0000 Subject: [PATCH 1/4] Accepting request 304144 from home:fstrba:branches:GNOME:Factory Trying to make this openSUSE:Factory compatible OBS-URL: https://build.opensuse.org/request/show/304144 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/harfbuzz?expand=0&rev=72 --- harfbuzz-bootstrap.changes | 9 +++++++++ harfbuzz-bootstrap.spec | 6 ++---- harfbuzz.changes | 9 +++++++++ harfbuzz.spec | 6 ++---- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/harfbuzz-bootstrap.changes b/harfbuzz-bootstrap.changes index 55a3b15..3b3a423 100644 --- a/harfbuzz-bootstrap.changes +++ b/harfbuzz-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Apr 26 10:34:56 UTC 2015 - fstrba@suse.com + +- Make harfbuzz-bootstrap package provide the libharfbuzz.so.0 + * Makes the freshly built freetype2 installable +- Make harfbuzz-bootstrap-devel package provide the + pkgconfig(harfbuzz) + * Makes the freshly builg freetype2-devel installable + ------------------------------------------------------------------- Wed Apr 15 15:44:47 UTC 2015 - fstrba@suse.com diff --git a/harfbuzz-bootstrap.spec b/harfbuzz-bootstrap.spec index 59447be..ef86dc7 100644 --- a/harfbuzz-bootstrap.spec +++ b/harfbuzz-bootstrap.spec @@ -17,10 +17,6 @@ %global build_bootstrap 1 -%if %{build_bootstrap} -%global _use_internal_dependency_generator 0 -%global __find_provides %{nil} -%endif Name: harfbuzz-bootstrap Version: 0.9.40 Release: 0 @@ -34,6 +30,8 @@ BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{build_bootstrap} Source1000: harfbuzz-bootstrap-rpmlintrc +# Generation of pkgconfig(foo) provides for the bootstrap package +BuildRequires: pkg-config %else BuildRequires: harfbuzz-bootstrap BuildRequires: pkgconfig(cairo) >= 1.8.0 diff --git a/harfbuzz.changes b/harfbuzz.changes index 55a3b15..3b3a423 100644 --- a/harfbuzz.changes +++ b/harfbuzz.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Apr 26 10:34:56 UTC 2015 - fstrba@suse.com + +- Make harfbuzz-bootstrap package provide the libharfbuzz.so.0 + * Makes the freshly built freetype2 installable +- Make harfbuzz-bootstrap-devel package provide the + pkgconfig(harfbuzz) + * Makes the freshly builg freetype2-devel installable + ------------------------------------------------------------------- Wed Apr 15 15:44:47 UTC 2015 - fstrba@suse.com diff --git a/harfbuzz.spec b/harfbuzz.spec index e215c2f..e14bbeb 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -17,10 +17,6 @@ %global build_bootstrap 0 -%if %{build_bootstrap} -%global _use_internal_dependency_generator 0 -%global __find_provides %{nil} -%endif Name: harfbuzz Version: 0.9.40 Release: 0 @@ -34,6 +30,8 @@ BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{build_bootstrap} Source1000: harfbuzz-bootstrap-rpmlintrc +# Generation of pkgconfig(foo) provides for the bootstrap package +BuildRequires: pkg-config %else BuildRequires: harfbuzz-bootstrap BuildRequires: pkgconfig(cairo) >= 1.8.0 From 31a21f6e436b5a7bfd444da78c148f43148d38babb6c736a24a5ff1826d03785 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Apr 2015 08:40:08 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/harfbuzz?expand=0&rev=73 --- harfbuzz-bootstrap.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harfbuzz-bootstrap.changes b/harfbuzz-bootstrap.changes index 3b3a423..66d59f3 100644 --- a/harfbuzz-bootstrap.changes +++ b/harfbuzz-bootstrap.changes @@ -5,7 +5,7 @@ Sun Apr 26 10:34:56 UTC 2015 - fstrba@suse.com * Makes the freshly built freetype2 installable - Make harfbuzz-bootstrap-devel package provide the pkgconfig(harfbuzz) - * Makes the freshly builg freetype2-devel installable + * Makes the freshly built freetype2-devel installable ------------------------------------------------------------------- Wed Apr 15 15:44:47 UTC 2015 - fstrba@suse.com From 5a6132f68b3cdfcfed3ea10b33b253845c10fbd7b494e757cb4a38b539d0cf8f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Apr 2015 08:40:20 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/harfbuzz?expand=0&rev=74 --- harfbuzz.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harfbuzz.changes b/harfbuzz.changes index 3b3a423..66d59f3 100644 --- a/harfbuzz.changes +++ b/harfbuzz.changes @@ -5,7 +5,7 @@ Sun Apr 26 10:34:56 UTC 2015 - fstrba@suse.com * Makes the freshly built freetype2 installable - Make harfbuzz-bootstrap-devel package provide the pkgconfig(harfbuzz) - * Makes the freshly builg freetype2-devel installable + * Makes the freshly built freetype2-devel installable ------------------------------------------------------------------- Wed Apr 15 15:44:47 UTC 2015 - fstrba@suse.com From b40d9151708cd75e1225ae27bc67f52b56bddf14a535c88b1d629a33029934eb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Apr 2015 09:44:58 +0000 Subject: [PATCH 4/4] fixup OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/harfbuzz?expand=0&rev=75 --- harfbuzz-bootstrap.changes | 7 +++++++ harfbuzz-bootstrap.spec | 2 ++ harfbuzz.changes | 7 +++++++ harfbuzz.spec | 2 ++ 4 files changed, 18 insertions(+) diff --git a/harfbuzz-bootstrap.changes b/harfbuzz-bootstrap.changes index 66d59f3..e91d19e 100644 --- a/harfbuzz-bootstrap.changes +++ b/harfbuzz-bootstrap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 27 09:44:21 UTC 2015 - dimstar@opensuse.org + +- Add this-is-only-for-build-envs requires to the -bootstrap + package: This ensures that OBS can use it, but the users will + not install it on their systems. + ------------------------------------------------------------------- Sun Apr 26 10:34:56 UTC 2015 - fstrba@suse.com diff --git a/harfbuzz-bootstrap.spec b/harfbuzz-bootstrap.spec index ef86dc7..38e7858 100644 --- a/harfbuzz-bootstrap.spec +++ b/harfbuzz-bootstrap.spec @@ -32,6 +32,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1000: harfbuzz-bootstrap-rpmlintrc # Generation of pkgconfig(foo) provides for the bootstrap package BuildRequires: pkg-config +# The bootstrap package is not supposed to be used by end users +Requires: this-is-only-for-build-envs %else BuildRequires: harfbuzz-bootstrap BuildRequires: pkgconfig(cairo) >= 1.8.0 diff --git a/harfbuzz.changes b/harfbuzz.changes index 66d59f3..e91d19e 100644 --- a/harfbuzz.changes +++ b/harfbuzz.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 27 09:44:21 UTC 2015 - dimstar@opensuse.org + +- Add this-is-only-for-build-envs requires to the -bootstrap + package: This ensures that OBS can use it, but the users will + not install it on their systems. + ------------------------------------------------------------------- Sun Apr 26 10:34:56 UTC 2015 - fstrba@suse.com diff --git a/harfbuzz.spec b/harfbuzz.spec index e14bbeb..f138bf5 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -32,6 +32,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1000: harfbuzz-bootstrap-rpmlintrc # Generation of pkgconfig(foo) provides for the bootstrap package BuildRequires: pkg-config +# The bootstrap package is not supposed to be used by end users +Requires: this-is-only-for-build-envs %else BuildRequires: harfbuzz-bootstrap BuildRequires: pkgconfig(cairo) >= 1.8.0