From 2e942f0cb43a1927992261a3b65412f5a7015b5f Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Oct 04 2010 10:31:36 +0000 Subject: - Update to 1.32.0 --- diff --git a/.gitignore b/.gitignore index c2a5251..d8c896f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ atk-1.30.0.tar.bz2 -/atk-1.30.0-gitb122c67.tar.gz +/atk-1.32.0.tar.bz2 diff --git a/0001-Fix-build-problem-with-jhbuild.patch b/0001-Fix-build-problem-with-jhbuild.patch deleted file mode 100644 index 6010f70..0000000 --- a/0001-Fix-build-problem-with-jhbuild.patch +++ /dev/null @@ -1,61 +0,0 @@ -From efbd81a12773e858331af089ddd829d80b839a74 Mon Sep 17 00:00:00 2001 -From: Theppitak Karoonboonyanan -Date: Thu, 6 May 2010 16:28:20 +0800 -Subject: [PATCH] Fix build problem with jhbuild. - -Bug #617851. ---- - atk/Makefile.am | 18 +++++++++++++----- - 1 files changed, 13 insertions(+), 5 deletions(-) - -diff --git a/atk/Makefile.am b/atk/Makefile.am -index 0ed5f66..19c2816 100644 ---- a/atk/Makefile.am -+++ b/atk/Makefile.am -@@ -30,7 +30,7 @@ libatk_1_0_la_LIBADD = \ - $(DEP_LIBS) \ - $(INTLLIBS) - --libatk_1_0_la_SOURCES = \ -+atk_sources = \ - atkaction.c \ - atkcomponent.c \ - atkdocument.c \ -@@ -57,7 +57,10 @@ libatk_1_0_la_SOURCES = \ - atktext.c \ - atkutil.c \ - atkmisc.c \ -- atkvalue.c \ -+ atkvalue.c -+ -+libatk_1_0_la_SOURCES = \ -+ $(atk_sources) \ - atk-enum-types.c - - libatkincludedir=$(includedir)/atk-1.0/atk -@@ -148,14 +151,19 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile - - if HAVE_INTROSPECTION - introspection_sources = \ -- $(libatkinclude_HEADERS) \ -- $(libatk_1_0_la_SOURCES) -+ $(atk_headers) \ -+ $(atk_sources) -+introspection_generated_sources = \ -+ atk-enum-types.c \ -+ atk-enum-types.h - - Atk-1.0.gir: libatk-1.0.la - Atk_1_0_gir_INCLUDES = GObject-2.0 - Atk_1_0_gir_CFLAGS = $(INCLUDES) - Atk_1_0_gir_LIBS = libatk-1.0.la --Atk_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) -+Atk_1_0_gir_FILES = \ -+ $(addprefix $(srcdir)/, $(introspection_sources)) \ -+ $(introspection_generated_sources) - INTROSPECTION_GIRS += Atk-1.0.gir - - girdir = $(datadir)/gir-1.0 --- -1.7.2.3 - diff --git a/0001-introspection-Associate-.gir-with-pkg-config-file.patch b/0001-introspection-Associate-.gir-with-pkg-config-file.patch deleted file mode 100644 index 284b2da..0000000 --- a/0001-introspection-Associate-.gir-with-pkg-config-file.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 380204b95cb0a611df0233bf6275b5b511268240 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 2 Sep 2010 11:07:12 -0400 -Subject: [PATCH] introspection: Associate .gir with pkg-config file - -Also depend on Makefile for consistency. ---- - atk/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/atk/Makefile.am b/atk/Makefile.am -index 19c2816..a900965 100644 ---- a/atk/Makefile.am -+++ b/atk/Makefile.am -@@ -157,10 +157,11 @@ introspection_generated_sources = \ - atk-enum-types.c \ - atk-enum-types.h - --Atk-1.0.gir: libatk-1.0.la -+Atk-1.0.gir: libatk-1.0.la Makefile - Atk_1_0_gir_INCLUDES = GObject-2.0 - Atk_1_0_gir_CFLAGS = $(INCLUDES) - Atk_1_0_gir_LIBS = libatk-1.0.la -+Atk_1_0_gir_SCANNERFLAGS = --pkg-export atk - Atk_1_0_gir_FILES = \ - $(addprefix $(srcdir)/, $(introspection_sources)) \ - $(introspection_generated_sources) --- -1.7.2.3 - diff --git a/atk.spec b/atk.spec index e5f82b1..9d61644 100644 --- a/atk.spec +++ b/atk.spec @@ -1,16 +1,14 @@ %define glib2_version 2.6.0 %define gobject_introspection_version 0.9.6 -%define alphatag gitb122c67 Summary: Interfaces for accessibility support Name: atk -Version: 1.30.0 -Release: 8.%{alphatag}%{?dist}.1 +Version: 1.32.0 +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries #VCS: git:git://git.gnome.org/atk -Source: http://download.gnome.org/sources/atk/1.30/atk-%{version}-%{alphatag}.tar.gz -Source2: autogen.sh +Source: http://download.gnome.org/sources/atk/1.32/atk-%{version}.tar.bz2 URL: http://developer.gnome.org/projects/gap/ BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-doc-utils @@ -38,13 +36,9 @@ This package includes libraries, header files, and developer documentation needed for development of applications or toolkits which use ATK. %prep -%setup -q -n %{name}-%{version} -cp %{SOURCE2} . -chmod a+x %{SOURCE2} +%setup -q %build -# Force a bootstrap since we're patching a .am file -rm configure (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; %configure $CONFIGFLAGS) make %{?_smp_mflags} @@ -79,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gir-1.0 %changelog +* Mon Oct 04 2010 Bastien Nocera 1.32.0-2 +- Update to 1.32.0 + * Wed Sep 29 2010 jkeating - 1.30.0-8.gitb122c67.1 - Rebuilt for gcc bug 634757 diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 615d8d8..0000000 --- a/autogen.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="atk" -REQUIRED_AUTOMAKE_VERSION=1.7 - -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} - -USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/sources b/sources index 7598cc6..b5d7cf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -07e38f47bd21ac71d8e03681be937a87 atk-1.30.0-gitb122c67.tar.gz +b9a19a3e426cd9ca930f0108c4ee343f atk-1.32.0.tar.bz2