- merged from DEVEL

Changed files:
    atk-locale-names.patch -> 1.2
    atk.spec -> 1.69

diff --git a/atk-locale-names.patch b/atk-locale-names.patch
new file mode 100644 (file)
index 0000000..c940c11
--- /dev/null
+++ b/atk-locale-names.patch
@@ -0,0 +1,12 @@
+diff -urN aa/atk-1.5.5/configure.in atk-1.5.5/configure.in
+--- aa/atk-1.5.5/configure.in  2004-02-24 14:37:42.000000000 +0100
++++ atk-1.5.5/configure.in     2004-02-24 15:28:38.582691744 +0100
+@@ -151,7 +151,7 @@
+ # Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs
+ DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
+ 
+-ALL_LINGUAS="af am az be bg bn ca cs cy da de en_CA en_GB el eo es et fa fi fr ga he hi hr hu kn ko id is it ja li lv lt ml mk mn ms ne nl nn no pl pt pt_BR ro ru sk sl sq sr sr@ije sr@Latn sv ta tr uk vi yi zh_CN zh_TW"
++ALL_LINGUAS="af am az be bg bn ca cs cy da de en_CA en_GB el eo es et fa fi fr ga he hi hr hu kn ko id is it ja li lv lt ml mk mn ms nb ne nl nn pl pt pt_BR ro ru sk sl sq sr sr@ije sr@Latn sv ta tr uk vi yi zh_CN zh_TW"
+ AM_GLIB_GNU_GETTEXT
+ 
+ AM_GLIB_DEFINE_LOCALEDIR(ATK_LOCALEDIR)

diff --git a/atk.spec b/atk.spec
index ffb14c86b664e912baf092cb05cc5cdae696c072..df1cf72e45404b5aa70e35beffdaa35b1ce0305c 100644 (file)
--- a/atk.spec
+++ b/atk.spec
@@ -2,20 +2,22 @@ Summary:      ATK - Accessibility Toolkit
 Summary(pl):   ATK - biblioteka u³atwiaj±ca niepe³nosprawnym korzystanie z komputerów
 Summary(pt_BR):        Interfaces para suporte a acessibilidade
 Name:          atk
-Version:       1.4.1
-Release:       2
+Version:       1.6.0
+Release:       1
 License:       GPL
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5: d7830bdf1e05d8395794f75097d291be
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 5e699af22a934ea3c1c1ed3742da0500
+Patch0:                %{name}-locale-names.patch
 URL:           http://developer.gnome.org/projects/gap/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: diffutils
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 2.2.3
+BuildRequires: glib2-devel >= 2.4.0
 BuildRequires: gtk-doc >= 1.1
 BuildRequires: libtool
+BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.1-10
 Obsoletes:     libatk1.0_0
@@ -48,8 +50,8 @@ Summary:      ATK - header and development documentation
 Summary(pl):   Pliki nag³ówkowe i dokumentacja
 Summary(pt_BR):        Interfaces para suporte a acessibilidade
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
-Requires:      glib2-devel >= 2.2.3
+Requires:      %{name} = %{version}-%{release}
+Requires:      glib2-devel >= 2.3.1
 Requires:      gtk-doc-common
 Obsoletes:     libatk1.0_0-devel
 
@@ -67,7 +69,7 @@ Summary:      ATK static library
 Summary(pl):   Biblioteka statyczna ATK
 Summary(pt_BR):        Interfaces para suporte a acessibilidade
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 ATK static library.
@@ -80,9 +82,12 @@ Interfaces para suporte a acessibilidade.
 
 %prep
 %setup -q
+%patch0 -p1
+
+mv po/{no,nb}.po
 
 %build
-cp /usr/share/gtk-doc/data/gtk-doc.make .
+gtkdocize --copy
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -91,6 +96,7 @@ cp /usr/share/gtk-doc/data/gtk-doc.make .
 %configure \
        --enable-static \
        --enable-shared \
+       --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}
 
 %{__make}