From a60ffc068b6289ecef57ec2b7dd916d249003d187d51b4693a742ece19292fe6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 5 Oct 2009 20:43:26 +0000 Subject: [PATCH] Accepting request 21755 from GNOME:Factory Copy from GNOME:Factory/gnome-common based on submit request 21755 from user vuntz OBS-URL: https://build.opensuse.org/request/show/21755 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-common?expand=0&rev=9 --- gnome-common-2.26.0.tar.bz2 | 3 --- gnome-common-2.28.0.tar.bz2 | 3 +++ gnome-common-automake-1.11.patch | 23 ----------------------- gnome-common.changes | 8 ++++++++ gnome-common.spec | 16 +++------------- 5 files changed, 14 insertions(+), 39 deletions(-) delete mode 100644 gnome-common-2.26.0.tar.bz2 create mode 100644 gnome-common-2.28.0.tar.bz2 delete mode 100644 gnome-common-automake-1.11.patch diff --git a/gnome-common-2.26.0.tar.bz2 b/gnome-common-2.26.0.tar.bz2 deleted file mode 100644 index c7e7668..0000000 --- a/gnome-common-2.26.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6233ee73886c5ac31890c1a9b9f216e5f14558467dea7b0a61ef3c4cf51d84d -size 69278 diff --git a/gnome-common-2.28.0.tar.bz2 b/gnome-common-2.28.0.tar.bz2 new file mode 100644 index 0000000..f720a88 --- /dev/null +++ b/gnome-common-2.28.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1 +size 151535 diff --git a/gnome-common-automake-1.11.patch b/gnome-common-automake-1.11.patch deleted file mode 100644 index ab5c7c9..0000000 --- a/gnome-common-automake-1.11.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur gnome-common-2.26.0/macros2/gnome-autogen.sh gnome-common-2.26.0.patched//macros2/gnome-autogen.sh ---- gnome-common-2.26.0/macros2/gnome-autogen.sh 2009-03-19 21:08:16.000000000 +0100 -+++ gnome-common-2.26.0.patched//macros2/gnome-autogen.sh 2009-06-26 10:25:08.000000000 +0200 -@@ -310,12 +310,13 @@ - - case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; -- 1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; -- 1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; -- 1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; -- 1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;; -- 1.9*) automake_progs="automake-1.10 automake-1.9" ;; -- 1.10*) automake_progs="automake-1.10" ;; -+ 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" ;; - 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 332105f..da5d2d8 100644 --- a/gnome-common.changes +++ b/gnome-common.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Sep 22 13:41:20 CEST 2009 - dimstar@opensuse.org + +- Update to version 2.28.0: + + Support for automake 1.11 + + use AM_SILENT_RULES +- Drop gnome-common-automake-1.11.patch, upstream included. + ------------------------------------------------------------------- Fri Jun 26 10:30:50 CEST 2009 - dominique-obs@leuenberger.net diff --git a/gnome-common.spec b/gnome-common.spec index 13ddfe4..13c1954 100644 --- a/gnome-common.spec +++ b/gnome-common.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-common (Version 2.26.0) +# spec file for package gnome-common (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,13 +31,11 @@ Requires: intltool Requires: libtool Requires: pkg-config Summary: Commonly Used Files for the GNOME 2.x Desktop Platform -Version: 2.26.0 -Release: 2 +Version: 2.28.0 +Release: 1 License: GPL v2 or later Group: System/GUI/GNOME Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM gnome-common-automake-1.11.patch dominique-obs@leuenberger.net -- Adds compatibility to automake 1.11 -Patch0: %{name}-automake-1.11.patch Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -46,16 +44,8 @@ BuildArch: noarch Gnome-common includes files used by most GNOME 2.x Desktop applications. - - -Authors: --------- - Darin Adler - Martin Baulig - %prep %setup -q -%patch0 -p1 %build %configure