pool/gnome-common
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 132691 from GNOME:Next

Browse Source 
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
This commit is contained in:
Vincent Untz 2012-09-07 17:26:25 +00:00 committed by Git OBS Bridge
parent 3adb3fa57a
commit 4f3db90631
5 changed files with 27 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-common-3.4.0.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d92a5d1dae550c409f644d87a4bba17342e14fb11ce8b1e58757ce35f3a46f7
size 152084

3
gnome-common-3.5.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41265663758a357bbf421fa0cb901e331a47d682813485960a5b5df3ac8c6f9f
size 142168

43
gnome-common-am112.patch
View File

@ -1,43 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
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"

12
gnome-common.changes
View File

@ -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

27
gnome-common.spec
View File

@ -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