From 3033f476e18d7b985b7c58b858e0518ff4126a1c85dc7b1d625758c74f275438 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 5 Oct 2017 12:25:01 +0000 Subject: [PATCH] Accepting request 531560 from GNOME:Next - Update to version 1.54.1: + girnode.c: Use locale-independent functions to parse numbers (bgo#788087). - Drop '%if 0%{suse_version} <= 1140' conditional: obsolete. OBS-URL: https://build.opensuse.org/request/show/531560 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gobject-introspection?expand=0&rev=177 --- gobject-introspection-1.54.0.tar.xz | 3 --- gobject-introspection-1.54.1.tar.xz | 3 +++ gobject-introspection.changes | 8 +++++++ gobject-introspection.spec | 37 ++++++++++++----------------- 4 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 gobject-introspection-1.54.0.tar.xz create mode 100644 gobject-introspection-1.54.1.tar.xz diff --git a/gobject-introspection-1.54.0.tar.xz b/gobject-introspection-1.54.0.tar.xz deleted file mode 100644 index b5ab397..0000000 --- a/gobject-introspection-1.54.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67e76742ce78821bce8a613183368222919b24e2dcf5fe26f17726c11c422ed7 -size 1392632 diff --git a/gobject-introspection-1.54.1.tar.xz b/gobject-introspection-1.54.1.tar.xz new file mode 100644 index 0000000..8b0251a --- /dev/null +++ b/gobject-introspection-1.54.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e +size 1392504 diff --git a/gobject-introspection.changes b/gobject-introspection.changes index aad4d57..95eeaa8 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Oct 4 00:15:15 UTC 2017 - luc14n0@linuxmail.org + +- Update to version 1.54.1: + + girnode.c: Use locale-independent functions to parse numbers + (bgo#788087). +- Drop '%if 0%{suse_version} <= 1140' conditional: obsolete. + ------------------------------------------------------------------- Mon Sep 11 11:07:03 UTC 2017 - dimstar@opensuse.org diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 9cdab3c..af27738 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -17,15 +17,15 @@ Name: gobject-introspection -Version: 1.54.0 +Version: 1.54.1 Release: 0 # FIXME: Find a way to identify if we need python3-gobject or python-gobject from gi-find-deps.sh. # 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+ and GPL-2.0+ +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.54/%{name}-%{version}.tar.xz +Url: https://live.gnome.org/GObjectIntrospection +Source0: https://download.gnome.org/sources/gobject-introspection/1.54/%{name}-%{version}.tar.xz # gi-find-deps.sh is a rpm helper for Provides and Requires. Script creates typelib()-style Provides/Requires. Source1: gi-find-deps.sh Source2: gobjectintrospection.attr @@ -37,6 +37,7 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: gtk-doc BuildRequires: libffi-devel +BuildRequires: pkgconfig BuildRequires: python-Mako BuildRequires: python-devel >= 2.7 BuildRequires: python-xml @@ -50,7 +51,6 @@ Requires: libgirepository-1_0-1 = %{version} # gi-find-deps uses the enhanced grep variant in order to do multi-line matching (for pkg.requires(..)) Requires: pcre-tools Requires: python-xml -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The goal of the project is to describe the APIs and collect them in @@ -73,7 +73,7 @@ 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}') +%(cat %{SOURCE3} | awk '{ print "Provides: " $0}') %description -n girepository-1_0 The goal of the project is to describe the APIs and collect them in @@ -99,21 +99,18 @@ a uniform, machine readable format. --enable-gtk-doc \ --disable-static \ --enable-doctool -%__make %{?_smp_mflags} V=1 +make %{?_smp_mflags} V=1 %install -%makeinstall +%make_install find %{buildroot} -type f -name "*.la" -delete -print -install -D %{S:1} %{buildroot}%{_rpmconfigdir}/gi-find-deps.sh -install -D %{S:2} -m 0644 %{buildroot}%{_rpmconfigdir}/fileattrs/gobjectintrospection.attr +install -D %{SOURCE1} %{buildroot}%{_rpmconfigdir}/gi-find-deps.sh +install -D %{SOURCE2} -m 0644 %{buildroot}%{_rpmconfigdir}/fileattrs/gobjectintrospection.attr # comparing, if we provide all the symbols expected. -ls %{buildroot}%{_libdir}/girepository-1.0/*.typelib | sh %{S:1} -P > gobject-introspection-typelib.installed -diff -s %{S:3} gobject-introspection-typelib.installed +ls %{buildroot}%{_libdir}/girepository-1.0/*.typelib | sh %{SOURCE1} -P > gobject-introspection-typelib.installed +diff -s %{SOURCE3} gobject-introspection-typelib.installed %fdupes %{buildroot} -%clean -rm -rf %{buildroot} - %post -n libgirepository-1_0-1 -p /sbin/ldconfig %postun -n libgirepository-1_0-1 -p /sbin/ldconfig @@ -127,9 +124,9 @@ rm -rf %{buildroot} %{_bindir}/g-ir-generate %{_bindir}/g-ir-inspect %{_bindir}/g-ir-scanner -%doc %{_mandir}/man1/g-ir-compiler.1* -%doc %{_mandir}/man1/g-ir-generate.1* -%doc %{_mandir}/man1/g-ir-scanner.1* +%{_mandir}/man1/g-ir-compiler.1* +%{_mandir}/man1/g-ir-generate.1* +%{_mandir}/man1/g-ir-scanner.1* %{_datadir}/aclocal/introspection.m4 %{_datadir}/gir-1.0/*.gir %{_datadir}/gir-1.0/gir-1.2.rnc @@ -145,10 +142,6 @@ rm -rf %{buildroot} %{_datadir}/gobject-introspection-1.0/tests/ %{_datadir}/gobject-introspection-1.0/gdump.c %{_rpmconfigdir}/gi-find-deps.sh -%if 0%{suse_version} <= 1140 -# This was not in old versions of rpm -%dir %{_rpmconfigdir}/fileattrs -%endif %{_rpmconfigdir}/fileattrs/gobjectintrospection.attr %files -n libgirepository-1_0-1