From fcc482c696d7b41aa333d98e1d1b701524bd55759420e8cbf7d2a282d329cc6a Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 27 May 2011 08:40:53 +0000 Subject: [PATCH] Accepting request 71625 from home:dimstar:branches:Base:System ok.. that one works too OBS-URL: https://build.opensuse.org/request/show/71625 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=47 --- gi-find-deps.sh | 2 +- gobject-introspection.attr | 3 +++ gobject-introspection.changes | 8 ++++++++ gobject-introspection.spec | 7 +++++-- 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 gobject-introspection.attr diff --git a/gi-find-deps.sh b/gi-find-deps.sh index c5470f6..dd97bcd 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -28,7 +28,7 @@ fi function find_provides { while read file; do case $file in - /usr/lib[^/]*/girepository-1.0/*.typelib) + *.typelib) split_name_version $(basename $file | sed 's,.typelib$,,') print_req_prov ;; diff --git a/gobject-introspection.attr b/gobject-introspection.attr new file mode 100644 index 0000000..d438654 --- /dev/null +++ b/gobject-introspection.attr @@ -0,0 +1,3 @@ +%__gobjectintrospection_provides %{_rpmconfigdir}/gi-find-deps.sh -P +%__gobjectintrospection_requires %{_rpmconfigdir}/gi-find-deps.sh -R +%__gobjectintrospection_path ^(%{_libdir}/girepository-1\.0/.*\.typelib)|(.*\.py)|(.*\.js)$ diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 0576358..f8aaedd 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 17 09:06:56 UTC 2011 - dimstar@opensuse.org + +- Add gobject-introspection.attr: install rpm reqprov plugin + handler. +- Move the rpm helpers (gi-find-deps.sh and gobject.attr) to the + main package. + ------------------------------------------------------------------- Wed Apr 27 09:16:02 UTC 2011 - dimstar@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 466f69a..b04aa58 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -28,6 +28,7 @@ Group: Development/Libraries/GNOME Source0: %{name}-%{version}.tar.bz2 # gi-find-deps.sh is a rpm helper for Provides and Requires. Script creates typelib()-style Provides/Requires. Source1: gi-find-deps.sh +Source2: gobject-introspection.attr Source99: %{name}-rpmlintrc BuildRequires: bison BuildRequires: fdupes @@ -88,7 +89,8 @@ a uniform, machine readable format. %install %makeinstall find %{buildroot} -type f -name "*.la" -delete -print -install -D %{S:1} %{buildroot}%{_prefix}/lib/rpm/gi-find-deps.sh +install -D %{S:1} %{buildroot}%{_rpmconfigdir}/gi-find-deps.sh +install -D %{S:2} -m 0644 %{buildroot}%{_rpmconfigdir}/fileattrs/gobjectintrospection.attr %fdupes %{buildroot} %clean @@ -121,6 +123,8 @@ rm -rf %{buildroot} %{_datadir}/gobject-introspection-1.0/Makefile.introspection %{_datadir}/gobject-introspection-1.0/tests/ %{_datadir}/gobject-introspection-1.0/gdump.c +%{_rpmconfigdir}/gi-find-deps.sh +%{_rpmconfigdir}/fileattrs/gobjectintrospection.attr %files -n libgirepository-1_0-1 %defattr(-,root,root) @@ -139,6 +143,5 @@ rm -rf %{buildroot} # FIXME: those two files should be moved to the main package when bgo#629930 gets fixed %{_libdir}/pkgconfig/gobject-introspection-1.0.pc %{_libdir}/pkgconfig/gobject-introspection-no-export-1.0.pc -%{_prefix}/lib/rpm/gi-find-deps.sh %changelog