From 4f3db906314a515807376f58d47b38d6d3ce91fe33066723826100231b93f5eb Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 17:26:25 +0000 Subject: [PATCH 1/4] Accepting request 132691 from GNOME:Next Starting to push GNOME:Next... OBS-URL: https://build.opensuse.org/request/show/132691 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-common?expand=0&rev=28 --- gnome-common-3.4.0.1.tar.xz | 3 --- gnome-common-3.5.5.tar.xz | 3 +++ gnome-common-am112.patch | 43 ------------------------------------- gnome-common.changes | 12 +++++++++++ gnome-common.spec | 27 +++++++++++------------ 5 files changed, 27 insertions(+), 61 deletions(-) delete mode 100644 gnome-common-3.4.0.1.tar.xz create mode 100644 gnome-common-3.5.5.tar.xz delete mode 100644 gnome-common-am112.patch diff --git a/gnome-common-3.4.0.1.tar.xz b/gnome-common-3.4.0.1.tar.xz deleted file mode 100644 index 7875166..0000000 --- a/gnome-common-3.4.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d92a5d1dae550c409f644d87a4bba17342e14fb11ce8b1e58757ce35f3a46f7 -size 152084 diff --git a/gnome-common-3.5.5.tar.xz b/gnome-common-3.5.5.tar.xz new file mode 100644 index 0000000..dec4072 --- /dev/null +++ b/gnome-common-3.5.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41265663758a357bbf421fa0cb901e331a47d682813485960a5b5df3ac8c6f9f +size 142168 diff --git a/gnome-common-am112.patch b/gnome-common-am112.patch deleted file mode 100644 index 0cb9195..0000000 --- a/gnome-common-am112.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Jan Engelhardt -Date: 2012-05-30 15:52:46.147646604 +0200 - -First, using "1.4*" is prone to match a future version of -automake-1.40. Don't do things like that, it has already bitten -people with the FreeBSD 10 release that matched freebsd1* (in -config.guess). - -Second, upstream should think of something so that gnome-autogen.sh -does /not/ need to be modified for every new automake release. - ---- - macros2/gnome-autogen.sh | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -Index: gnome-common-3.4.0.1/macros2/gnome-autogen.sh -=================================================================== ---- gnome-common-3.4.0.1.orig/macros2/gnome-autogen.sh -+++ gnome-common-3.4.0.1/macros2/gnome-autogen.sh -@@ -324,14 +324,15 @@ version_check autoconf AUTOCONF 'autocon - AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - - case $REQUIRED_AUTOMAKE_VERSION in -- 1.4*) automake_progs="automake-1.4" ;; -- 1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; -- 1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; -- 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; -- 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; -- 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;; -- 1.10*) automake_progs="automake-1.11 automake-1.10" ;; -- 1.11*) automake_progs="automake-1.11" ;; -+ 1.4|1.4[[:alpha:]]|1.4.*) automake_progs="automake-1.4" ;; -+ 1.5|1.5[[:alpha:]]|1.5.*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; -+ 1.6|1.6[[:alpha:]]|1.6.*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; -+ 1.7|1.7[[:alpha:]]|1.7.*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; -+ 1.8|1.8[[:alpha:]]|1.8.*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; -+ 1.9|1.9[[:alpha:]]|1.9.*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; -+ 1.10|1.10[[:alpha:]]|1.10.*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;; -+ 1.11|1.11[[:alpha::]|1.11.*) automake_progs="automake-1.12 automake-1.11" ;; -+ 1.12|1.12[[:alpha::]|1.12.*) automake_progs="automake-1.12 automake-1.11" ;; - esac - version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ - "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" diff --git a/gnome-common.changes b/gnome-common.changes index 1db3c4c..e56bad7 100644 --- a/gnome-common.changes +++ b/gnome-common.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Aug 8 17:58:41 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.5: + + Add support for automake 1.12. + + Fix bashishms (bgo#588020). + + Do not call automake with --force (bgo#612329). + + Fix srcdir!=builddir for scrollmaker (bgo#315320, bgo#409060). + + Check for glibtoolize in gnome-autogen.sh. + + Trace AC_CONFIG_SUBDIRS with autoconf. +- Drop gnome-common-am112.patch: fixed upstream. + ------------------------------------------------------------------- Wed May 30 13:53:12 UTC 2012 - jengelh@inai.de diff --git a/gnome-common.spec b/gnome-common.spec index 015ca1f..cb1e444 100644 --- a/gnome-common.spec +++ b/gnome-common.spec @@ -17,27 +17,25 @@ Name: gnome-common +Version: 3.5.5 +Release: 0 +Summary: Common Files to Build GNOME +License: GPL-2.0+ +Group: System/GUI/GNOME +Url: http://www.gnome.org/ +Source: http://download.gnome.org/sources/gnome-common/3.5/%{name}-%{version}.tar.xz BuildRequires: pkg-config Requires: autoconf Requires: automake Requires: gettext-tools -# Not a typo: we want glib-gettextize -Requires: glib2-devel Requires: gnome-doc-utils Requires: gtk-doc Requires: intltool Requires: libtool Requires: pkg-config Requires: yelp-tools -Summary: Common Files to Build GNOME -License: GPL-2.0+ -Group: System/GUI/GNOME -Version: 3.4.0.1 -Release: 0 -Source: http://download.gnome.org/sources/gnome-common/3.4/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gnome-common-am112.patch bgo#675093 jengelh@inai.de -- Add support for automake 1.12. -Patch1: gnome-common-am112.patch -Url: http://www.gnome.org/ +# Not a typo: we want glib-gettextize +Requires: pkgconfig(glib-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -46,21 +44,20 @@ Gnome-common includes files used by to build GNOME and GNOME applications. %prep %setup -q -%patch -P 1 -p1 %build %configure make %{?_smp_mflags} %install -%makeinstall +%make_install %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr (-, root, root) -%doc COPYING ChangeLog README +%doc ChangeLog README NEWS %{_bindir}/gnome-autogen.sh %{_bindir}/gnome-doc-common %dir %{_datadir}/aclocal From 785e19394026df1986c35ecbcd73d2908e3917cf1112facd724e28c3cb92dbc9 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 17:27:37 +0000 Subject: [PATCH 2/4] Accepting request 133293 from home:vuntz:branches:GNOME:Factory suggested tweak OBS-URL: https://build.opensuse.org/request/show/133293 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-common?expand=0&rev=29 --- gnome-common.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnome-common.spec b/gnome-common.spec index cb1e444..991e46b 100644 --- a/gnome-common.spec +++ b/gnome-common.spec @@ -28,14 +28,14 @@ BuildRequires: pkg-config Requires: autoconf Requires: automake Requires: gettext-tools +# Avoiding pkgconfig()-style because we want glib-gettextize +Requires: glib2-devel Requires: gnome-doc-utils Requires: gtk-doc Requires: intltool Requires: libtool Requires: pkg-config Requires: yelp-tools -# Not a typo: we want glib-gettextize -Requires: pkgconfig(glib-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch From 96213be13df7950062413e76115572ca37fc4d31481d49c9dd2acab03344e244 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 10 Sep 2012 10:26:20 +0000 Subject: [PATCH 3/4] Accepting request 133411 from home:Zaitor:branches:GNOME:Factory Update to ver 3.5.91 OBS-URL: https://build.opensuse.org/request/show/133411 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-common?expand=0&rev=30 --- gnome-common-3.5.5.tar.xz | 3 --- gnome-common-3.5.91.tar.xz | 3 +++ gnome-common.changes | 7 +++++++ gnome-common.spec | 3 ++- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 gnome-common-3.5.5.tar.xz create mode 100644 gnome-common-3.5.91.tar.xz diff --git a/gnome-common-3.5.5.tar.xz b/gnome-common-3.5.5.tar.xz deleted file mode 100644 index dec4072..0000000 --- a/gnome-common-3.5.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41265663758a357bbf421fa0cb901e331a47d682813485960a5b5df3ac8c6f9f -size 142168 diff --git a/gnome-common-3.5.91.tar.xz b/gnome-common-3.5.91.tar.xz new file mode 100644 index 0000000..0423fca --- /dev/null +++ b/gnome-common-3.5.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dc4583c58bd4457aa290ee8c6dc991b764a6322a181a4e51f6f8d50ef78ffbd +size 143476 diff --git a/gnome-common.changes b/gnome-common.changes index e56bad7..8dcb91a 100644 --- a/gnome-common.changes +++ b/gnome-common.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 9 19:23:57 UTC 2012 - zaitor@opensuse.org + +- Update to version 3.5.91: + + Add code coverage support (bgo#606720). +- Package new file: gnome-code-coverage.m4. + ------------------------------------------------------------------- Wed Aug 8 17:58:41 UTC 2012 - dimstar@opensuse.org diff --git a/gnome-common.spec b/gnome-common.spec index 991e46b..794cccd 100644 --- a/gnome-common.spec +++ b/gnome-common.spec @@ -17,7 +17,7 @@ Name: gnome-common -Version: 3.5.5 +Version: 3.5.91 Release: 0 Summary: Common Files to Build GNOME License: GPL-2.0+ @@ -61,6 +61,7 @@ rm -rf %{buildroot} %{_bindir}/gnome-autogen.sh %{_bindir}/gnome-doc-common %dir %{_datadir}/aclocal +%{_datadir}/aclocal/gnome-code-coverage.m4 %{_datadir}/aclocal/gnome-common.m4 %{_datadir}/aclocal/gnome-compiler-flags.m4 %{_datadir}/gnome-common/ From b9def6b127f20d441b761ab485146cf43d135c4462aaaf39060dc7f4dd5b6e04 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 10 Sep 2012 10:27:47 +0000 Subject: [PATCH 4/4] Accepting request 133445 from home:vuntz:branches:GNOME:Factory suggested tweak OBS-URL: https://build.opensuse.org/request/show/133445 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-common?expand=0&rev=31 --- gnome-common.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/gnome-common.changes b/gnome-common.changes index 8dcb91a..c0eef74 100644 --- a/gnome-common.changes +++ b/gnome-common.changes @@ -3,7 +3,6 @@ Sun Sep 9 19:23:57 UTC 2012 - zaitor@opensuse.org - Update to version 3.5.91: + Add code coverage support (bgo#606720). -- Package new file: gnome-code-coverage.m4. ------------------------------------------------------------------- Wed Aug 8 17:58:41 UTC 2012 - dimstar@opensuse.org