OBS User unknown 2009-07-17 15:18:29 +00:00 committed by Git OBS Bridge
parent b0000fd188
commit 9a6a9170b9
3 changed files with 33 additions and 64 deletions

View File

@ -0,0 +1,23 @@
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"

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 26 10:30:50 CEST 2009 - dominique-obs@leuenberger.net
- Add patch gnome-common-automake-1.11.patch to be compatible
to automake 1.11
-------------------------------------------------------------------
Fri Mar 20 02:08:19 CET 2009 - vuntz@novell.com

View File

@ -32,10 +32,12 @@ Requires: libtool
Requires: pkg-config
Summary: Commonly Used Files for the GNOME 2.x Desktop Platform
Version: 2.26.0
Release: 1
Release: 2
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
@ -53,6 +55,7 @@ Authors:
%prep
%setup -q
%patch0 -p1
%build
%configure
@ -72,66 +75,3 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gnome-common
%changelog
* Fri Mar 20 2009 vuntz@novell.com
- Update to version 2.26.0:
+ Add more flags to DISABLE_DEPRECATED.
- Remove AutoReqProv: it's default now.
* Sun Jan 25 2009 vuntz@novell.com
- Add various Requires to make gnome-common work out of the box.
Fix bnc#463104.
* Tue Sep 23 2008 mboman@suse.de
- Update to version 2.24.0:
+ Cosmetic version bump
* Tue Jan 29 2008 rodrigo@suse.de
- Update to version 2.20.0
* Wed Aug 01 2007 maw@suse.de
- Update to version 2.18.0
- Bugs (bugzilla.gnome.org) fixed: #377185, #360693, #377175,
[#323868], #343441, #321860, #319496, and #305641.
- Works with automake 1.10, so drop gnome-autogen.diff.
* Wed Dec 13 2006 sbrabec@suse.cz
- Prefix changed to /usr.
- Spec file cleanup.
* Sat Oct 21 2006 schwab@suse.de
- Work around bogus version check.
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Tue Sep 20 2005 rodrigo@suse.de
- Update to version 2.12.0.
* Thu Aug 04 2005 sbrabec@suse.cz
- Updated to version 2.11.0.
* Mon Nov 22 2004 sbrabec@suse.cz
- Fixed gnome-autogen.sh for multi-component GNOME2_PATH.
http://bugzilla.gnome.org/show_bug.cgi?id=159062
* Thu Nov 18 2004 gekker@suse.de
- Update to version 2.8.0
* Tue Aug 24 2004 ro@suse.de
- support automake 1.9 as well
* Wed Aug 04 2004 dobey@suse.de
- Add support for automake 1.8
* Mon Feb 23 2004 sbrabec@suse.cz
- Set owner to root, not bin.
* Thu Nov 06 2003 schwab@suse.de
- Fix directory permissions.
* Wed Oct 08 2003 sbrabec@suse.cz
- Updated to version 2.4.0 (GNOME 2.4).
* Mon Jul 14 2003 sbrabec@suse.cz
- GNOME prefix change to /opt/gnome.
* Thu Jun 12 2003 sbrabec@suse.cz
- Fixed directory packaging.
- Package marked as noarch.
* Mon Sep 09 2002 kukuk@suse.de
- Remove all the not needed packages from neededforbuild
* Fri Jun 14 2002 ro@suse.de
- move last change to glib2 package
* Fri Jun 14 2002 ro@suse.de
- add gnome2.{sh,csh} to have /opt/gnome2/bin first in PATH
on 7.3 and older distros
* Tue Apr 23 2002 ro@suse.de
- fix gnome1 macros for current autoconf (LIBOBJ usage)
* Tue Mar 05 2002 hhetter@suse.de
- shrink down #neededforbuild
* Thu Jan 17 2002 hhetter@suse.de
- prefix to /opt/gnome2
* Tue Jan 08 2002 hhetter@suse.de
- intial SuSE package for GNOME 2.0 platform