From d9b780738656af365fc70a761a104fad6740422dd3e14c2cf6c39a38fe24bc4b Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 1 Nov 2010 15:38:47 +0000 Subject: [PATCH] Accepting request 51486 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/51486 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=33 --- gobject-introspection-rpmlintrc | 2 ++ gobject-introspection.changes | 10 ++++++++++ gobject-introspection.spec | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gobject-introspection-rpmlintrc diff --git a/gobject-introspection-rpmlintrc b/gobject-introspection-rpmlintrc new file mode 100644 index 0000000..8bab1b2 --- /dev/null +++ b/gobject-introspection-rpmlintrc @@ -0,0 +1,2 @@ +addFilter(".*devel-file-in-non-devel-package.*/usr/share/gir-.*/*\.gir") +addFilter(".*devel-file-in-non-devel-package.*/usr/share/gobject-introspection-.*/*\.[ch]") diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 7b0b553..bc05ecd 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 27 09:23:15 EDT 2010 - vuntz@opensuse.org + +- Add a rpmlintrc file: the devel-file-in-non-devel-package errors + for gir and source files are wrong here, because + gobject-introspection is, by definition, a devel package (in the + same way as gcc is). +- Add an extra % to a macro in a comment to make rpmlint happy (and + to make sure that the macro won't get expanded). + ------------------------------------------------------------------- Sat Oct 9 11:23:59 CEST 2010 - vuntz@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index ae6c6bf..3f232bd 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -25,7 +25,8 @@ License: LGPLv2.1+ Summary: GObject Introspection Tools Url: http://live.gnome.org/GObjectIntrospection Group: Development/Libraries/GNOME -Source: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 +Source1: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM gobject-introspection-keyring-workaround.patch bgo#629426 vuntz@opensuse.org -- Workaround for libgnome-keyring Patch0: gobject-introspection-keyring-workaround.patch # PATCH-FIX-UPSTREAM gobject-introspection-libgda-workaround.patch bgo#629779 vuntz@opensuse.org -- Workaround for libgda @@ -101,7 +102,7 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/g-ir-scanner.1* %{_datadir}/aclocal/introspection.m4 %{_datadir}/gir-1.0/*.gir -# We don't include directly %{_libdir}/gobject-introspection since there might +# We don't include directly %%{_libdir}/gobject-introspection since there might # be files there in the future that belong to the library package %dir %{_libdir}/gobject-introspection %{_libdir}/gobject-introspection/giscanner/