From 7aaa90c441ebf6b0b96d8792297fce4b1dbacd843aeed7ecefdc54b7ef8b9f4c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 7 Jun 2017 13:34:11 +0000 Subject: [PATCH] Accepting request 499854 from home:olh:branches:GNOME:Factory - Remove version string from files generated by gdbus-codegen to avoid needless republishing of pkgs depending on glib2-devel added glib2-gdbus-codegen-version.patch OBS-URL: https://build.opensuse.org/request/show/499854 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=332 --- glib2-gdbus-codegen-version.patch | 34 +++++++++++++++++++++++++++++++ glib2.changes | 7 +++++++ glib2.spec | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 glib2-gdbus-codegen-version.patch diff --git a/glib2-gdbus-codegen-version.patch b/glib2-gdbus-codegen-version.patch new file mode 100644 index 0000000..06900ce --- /dev/null +++ b/glib2-gdbus-codegen-version.patch @@ -0,0 +1,34 @@ +--- a/gio/gdbus-2.0/codegen/codegen.py ++++ b/gio/gdbus-2.0/codegen/codegen.py +@@ -56,12 +56,12 @@ class CodeGenerator: + + def generate_intro(self): + self.c.write('/*\n' +- ' * Generated by gdbus-codegen %s. DO NOT EDIT.\n' ++ ' * Generated by gdbus-codegen. DO NOT EDIT.\n' + ' *\n' + ' * The license of this code is the same as for the source it was derived from.\n' + ' */\n' + '\n' +- %(config.VERSION)) ++ ) + self.c.write('#ifdef HAVE_CONFIG_H\n' + '# include "config.h"\n' + '#endif\n' +@@ -220,14 +220,14 @@ class CodeGenerator: + '\n') + + self.h.write('/*\n' +- ' * Generated by gdbus-codegen %s. DO NOT EDIT.\n' ++ ' * Generated by gdbus-codegen. DO NOT EDIT.\n' + ' *\n' + ' * The license of this code is the same as for the source it was derived from.\n' + ' */\n' + '\n' + '#ifndef __%s__\n' + '#define __%s__\n' +- '\n'%(config.VERSION, self.header_guard, self.header_guard)) ++ '\n'%(self.header_guard, self.header_guard)) + self.h.write('#include \n' + '\n' + 'G_BEGIN_DECLS\n' diff --git a/glib2.changes b/glib2.changes index de33796..b40f69f 100644 --- a/glib2.changes +++ b/glib2.changes @@ -4,6 +4,13 @@ Sun May 28 01:07:00 UTC 2017 - luke.nukem.jones@gmail.com - Add glib2-gmain-only-signal-GWakeup-right-before-or-during-a-b.patch: Fix event loop thread wakeup issue (bgo#761102) +------------------------------------------------------------------- +Fri May 26 05:57:24 UTC 2017 - olaf@aepfle.de + +- Remove version string from files generated by gdbus-codegen + to avoid needless republishing of pkgs depending on glib2-devel + added glib2-gdbus-codegen-version.patch + ------------------------------------------------------------------- Tue May 9 12:39:42 UTC 2017 - zaitor@opensuse.org diff --git a/glib2.spec b/glib2.spec index b951810..7bffebf 100644 --- a/glib2.spec +++ b/glib2.spec @@ -52,6 +52,7 @@ Patch13: glib2-suppress-schema-deprecated-path-warning.patch Patch14: glib2-dbus-socket-path.patch # PATCH-FIX-UPSTREAM glib2-gmain-only-signal-GWakeup-right-before-or-during-a-b.patch bgo761102 pbonzini@redhat.com -- Fix event loop thread wakeup issue Patch15: glib2-gmain-only-signal-GWakeup-right-before-or-during-a-b.patch +Patch16: glib2-gdbus-codegen-version.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -266,6 +267,7 @@ translation-update-upstream %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 cp -a %{S:1} %{S:2} %{S:5} . cp -a %{S:4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then