Author: glen Date: Mon Mar 31 19:50:12 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- 2.12.9 for AC
---- Files affected:
SPECS:
gtk+2.spec (1.279 -> 1.279.2.1)
---- Diffs:
================================================================
Index: SPECS/gtk+2.spec
diff -u SPECS/gtk+2.spec:1.279 SPECS/gtk+2.spec:1.279.2.1
--- SPECS/gtk+2.spec:1.279 Sat Mar 22 00:48:17 2008
+++ SPECS/gtk+2.spec Mon Mar 31 21:50:06 2008
@@ -38,7 +38,8 @@
Patch6: %{name}-lt.patch
Patch7: %{name}-arch_confdir.patch
URL: http://www.gtk.org/
-BuildRequires: atk-devel >= 1:1.22.0
+BuildRequires: XFree86-devel
+BuildRequires: atk-devel >= 1:1.20.0
BuildRequires: autoconf >= 2.54
BuildRequires: automake >= 1:1.7
BuildRequires: cairo-devel >= 1.4.0
@@ -46,39 +47,29 @@
BuildRequires: docbook-dtd412-xml
BuildRequires: docbook-style-xsl
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.16.1
+BuildRequires: glib2-devel >= 1:2.14.2
%{?with_apidocs:BuildRequires: gtk-doc >= 1.8}
BuildRequires: gtk-doc-automake >= 1.8
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: libtool >= 1:1.4.2-9
-BuildRequires: libxml2-progs >= 1:2.6.31
+BuildRequires: libxml2-progs >= 1:2.6.30
BuildRequires: libxslt-progs >= 1.1.20
-BuildRequires: pango-devel >= 1:1.20.0
+BuildRequires: pango-devel >= 1:1.18.3
BuildRequires: perl-base
BuildRequires: pkgconfig
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.197
-BuildRequires: xorg-lib-libX11-devel
-BuildRequires: xorg-lib-libXcursor-devel
-BuildRequires: xorg-lib-libXext-devel
-BuildRequires: xorg-lib-libXft-devel
-BuildRequires: xorg-lib-libXi-devel
-BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libXrandr-devel
-BuildRequires: xorg-lib-libXrender-devel
-Requires: atk >= 1:1.22.0
+Requires: atk >= 1:1.20.0
Requires: cairo >= 1.4.0
-Requires: glib2 >= 1:2.16.1
-Requires: pango >= 1:1.20.0
+Requires: glib2 >= 1:2.14.2
+Requires: pango >= 1:1.18.3
%if %{with cups}
# cups is used by default if gtk+ is built with cups
Suggests: %{name}-cups = %{epoch}:%{version}-%{release}
%endif
Obsoletes: gtk2
-# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
-Conflicts: glibc-misc < 6:2.7
Conflicts: gtk2-engines < 1:2.2.0-6
# autopanog.exe crashes with gtk+2 2.8.x and libgdiplus 1.1.8
Conflicts: libgdiplus < 1.1.9
@@ -149,17 +140,10 @@
Summary(tr.UTF-8): GIMP araç takımı ve çizim takımı
Group: X11/Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: atk-devel >= 1:1.22.0
-Requires: glib2-devel >= 1:2.16.1
-Requires: pango-devel >= 1:1.20.0
-Requires: xorg-lib-libX11-devel
-Requires: xorg-lib-libXcursor-devel
-Requires: xorg-lib-libXext-devel
-Requires: xorg-lib-libXft-devel
-Requires: xorg-lib-libXi-devel
-Requires: xorg-lib-libXinerama-devel
-Requires: xorg-lib-libXrandr-devel
-Requires: xorg-lib-libXrender-devel
+Requires: XFree86-devel
+Requires: atk-devel >= 1:1.20.0
+Requires: glib2-devel >= 1:2.14.2
+Requires: pango-devel >= 1:1.18.3
Obsoletes: gtk2-devel
%description devel
@@ -278,8 +262,7 @@
install -d $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
rm -r $RPM_BUILD_ROOT%{_datadir}/locale/az_IR
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
- mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
+
%find_lang %{name} --all-name
%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/{gdk,gdk-pixbuf,gtk}}
@@ -418,6 +401,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.279.2.1 2008-03-31 19:50:06 glen
+- 2.12.9 for AC
+
Revision 1.279 2008-03-21 23:48:17 glen
- files update for multiarch confdir
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gtk+2.spec?r1=1.279&r2=1.279.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
