From 425d5604e82a55e20ac9ea446bece0c2093f4ac3f515efbd3fe501b70966a3b8 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 23 May 2012 14:23:03 +0000 Subject: [PATCH 1/3] Accepting request 121792 from home:dimstar:branches:GNOME:Factory Attempt to fix bnc#684826 - at your disposal OBS-URL: https://build.opensuse.org/request/show/121792 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=97 --- gobject-introspection.changes | 11 +++++++++++ gobject-introspection.spec | 22 +++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/gobject-introspection.changes b/gobject-introspection.changes index b6c8f15..4935ec1 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue May 22 19:21:57 UTC 2012 - dimstar@opensuse.org + +- Drop xz BuildRequires, as it now comes for free in the build + system. +- Change rpm group of libgirepository-1_0-1 to System/Libraries. +- Create new subpackage girepository-1_0, which contains the + *.typelib files; this allows to bump the soname of + libgirepository and being able to parallel install them. + [bnc#684826]. + ------------------------------------------------------------------- Wed Apr 18 07:33:27 UTC 2012 - vuntz@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index b3f7e03..1a3ee3b 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -40,8 +40,6 @@ BuildRequires: libffi-devel BuildRequires: libtool BuildRequires: python-devel BuildRequires: python-xml -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gobject-2.0) %if 0%{?BUILD_FROM_VCS} @@ -58,12 +56,22 @@ a uniform, machine readable format. %package -n libgirepository-1_0-1 Summary: GObject Introspection Library -Group: Development/Libraries/GNOME +Group: System/Libraries +Requires: girepository-1_0 >= %{version} + +%description -n libgirepository-1_0-1 +The goal of the project is to describe the APIs and collect them in +a uniform, machine readable format. + +%package -n girepository-1_0 +Summary: GObject Introspection Library based typelibs +Group: System/Libraries +Requires: libgirepository-1_0-1 >= %{version} # Provide typelib() symbols based on gobject-introspection-typelib.template # The template is checked during install if it matches the installed *.typelib files. %(cat %{S:3} | awk '{ print "Provides: " $0}') -%description -n libgirepository-1_0-1 +%description -n girepository-1_0 The goal of the project is to describe the APIs and collect them in a uniform, machine readable format. @@ -151,7 +159,11 @@ rm -rf %{buildroot} # not have to own it %dir %{_datadir}/gir-1.0 %{_libdir}/libgirepository-1.0.so.* -%{_libdir}/girepository-1.0/ +%dir %{_libdir}/girepository-1.0 + +%files -n girepository-1_0 +%defattr(-,root,root) +%{_libdir}/girepository-1.0/*.typelib %files devel %defattr(-,root,root) From 9f5d72079013ab3a4079e8b881a755bec39bbb80d608f4a72b8faa516cfa708c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 23 May 2012 14:27:32 +0000 Subject: [PATCH 2/3] Accepting request 121949 from home:vuntz:branches:GNOME:Factory clarify .changes OBS-URL: https://build.opensuse.org/request/show/121949 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=98 --- gobject-introspection.changes | 15 ++++++++++----- gobject-introspection.spec | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 4935ec1..e172b25 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,13 +1,18 @@ ------------------------------------------------------------------- Tue May 22 19:21:57 UTC 2012 - dimstar@opensuse.org +- Create new subpackage girepository-1_0, which contains the + *.typelib files. This allows to bump the soname of + libgirepository and being able to parallel install several + libgirepository without a file conflict on the typelib files. + This fixes bnc#684826. +- Add a girepository-1_0 Requires to libgirepository-1_0-1, for the + above. The Requires is versioned with a >=, which is what allows + the parallel-installability. - Drop xz BuildRequires, as it now comes for free in the build system. -- Change rpm group of libgirepository-1_0-1 to System/Libraries. -- Create new subpackage girepository-1_0, which contains the - *.typelib files; this allows to bump the soname of - libgirepository and being able to parallel install them. - [bnc#684826]. +- Change rpm group of libgirepository-1_0-1 from + Development/Libraries/GNOME to System/Libraries. ------------------------------------------------------------------- Wed Apr 18 07:33:27 UTC 2012 - vuntz@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 1a3ee3b..30ca9a9 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -64,7 +64,7 @@ The goal of the project is to describe the APIs and collect them in a uniform, machine readable format. %package -n girepository-1_0 -Summary: GObject Introspection Library based typelibs +Summary: Base GObject Introspection Bindings Group: System/Libraries Requires: libgirepository-1_0-1 >= %{version} # Provide typelib() symbols based on gobject-introspection-typelib.template From c1008b54bd9a0ce2dff6645d47dfdeab02bc134699c084dc8778ff64fb5098f1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 6 Jun 2012 15:42:38 +0000 Subject: [PATCH 3/3] Accepting request 123871 from home:dimstar:branches:GNOME:Factory Fix license tags.. and typo OBS-URL: https://build.opensuse.org/request/show/123871 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=99 --- gobject-introspection.changes | 7 +++++++ gobject-introspection.spec | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gobject-introspection.changes b/gobject-introspection.changes index e172b25..eabecb4 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 6 15:17:10 UTC 2012 - dimstar@opensuse.org + +- Update License tags (bnc#765472): + + The main/src package is LGPL-2.1+ and GPL-2.0+ + + The library subpackages are LGPL-2.1+ + ------------------------------------------------------------------- Tue May 22 19:21:57 UTC 2012 - dimstar@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 30ca9a9..c4d5ffe 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -21,7 +21,7 @@ Version: 1.32.1 Release: 0 # FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel Summary: GObject Introspection Tools -License: LGPL-2.1+ +License: LGPL-2.1+ and GPL-2.0+ Group: Development/Libraries/GNOME Url: http://live.gnome.org/GObjectIntrospection Source0: http://download.gnome.org/sources/gobject-introspection/1.32/%{name}-%{version}.tar.xz @@ -56,6 +56,7 @@ a uniform, machine readable format. %package -n libgirepository-1_0-1 Summary: GObject Introspection Library +License: LGPL-2.1+ Group: System/Libraries Requires: girepository-1_0 >= %{version} @@ -65,6 +66,7 @@ a uniform, machine readable format. %package -n girepository-1_0 Summary: Base GObject Introspection Bindings +License: LGPL-2.1+ Group: System/Libraries Requires: libgirepository-1_0-1 >= %{version} # Provide typelib() symbols based on gobject-introspection-typelib.template @@ -77,6 +79,7 @@ a uniform, machine readable format. %package devel Summary: GObject Introspection Development Files +License: LGPL-2.1+ Group: Development/Libraries/GNOME # Note: the devel package requires the binaries, not just the library Requires: %{name} = %{version}