Author: patrys Date: Sun Sep 7 10:56:56 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.14.1 - merged from DEVEL
---- Files affected: SPECS: gtk+2.spec (1.283 -> 1.284) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.283 SPECS/gtk+2.spec:1.284 --- SPECS/gtk+2.spec:1.283 Tue Jul 1 22:14:15 2008 +++ SPECS/gtk+2.spec Sun Sep 7 12:56:51 2008 @@ -7,30 +7,27 @@ #| !/usr/bin/env python # # Conditional build: -%bcond_with macmenu # experimental mac/kde-like %bcond_without apidocs # disable gtk-doc %bcond_without cups # disable CUPS support %bcond_without static_libs # don't build static library # -Summary: The Gimp Toolkit -Summary(cs.UTF-8): Sada nástrojů pro Gimp -Summary(de.UTF-8): Der Gimp-Toolkit -Summary(fi.UTF-8): Gimp-työkalukokoelma -Summary(fr.UTF-8): Le toolkit de Gimp -Summary(it.UTF-8): Il toolkit per Gimp -Summary(pl.UTF-8): Gimp Toolkit -Summary(tr.UTF-8): Gimp ToolKit arayüz kitaplığı +Summary: The GIMP Toolkit +Summary(cs.UTF-8): Sada nástrojů pro GIMP +Summary(de.UTF-8): Der GIMP-Toolkit +Summary(fi.UTF-8): GIMP-työkalukokoelma +Summary(fr.UTF-8): Le toolkit de GIMP +Summary(it.UTF-8): Il toolkit per GIMP +Summary(pl.UTF-8): GIMP Toolkit +Summary(tr.UTF-8): GIMP ToolKit arayüz kitaplığı Name: gtk+2 -Version: 2.12.11 +Version: 2.14.1 Release: 1 Epoch: 2 License: LGPL v2+ Group: X11/Libraries -#Source0: ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-%{version}.tar.bz2 -Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.12/gtk+-%{version}.tar.bz2 -# Source0-md5: f7aab88e856a813386f797aade5867ad +Source0: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.14/gtk+-%{version}.tar.bz2 +# Source0-md5: c6e66ffe92724d83391187f0af016b23 Patch0: %{name}-insensitive-iain.patch -Patch1: %{name}-menu-mac.patch Patch2: %{name}-compose-table.patch.bz2 Patch3: %{name}-objective-c++.patch Patch4: %{name}-firefox-printpreview.patch @@ -41,14 +38,15 @@ BuildRequires: atk-devel >= 1:1.22.0 BuildRequires: autoconf >= 2.54 BuildRequires: automake >= 1:1.7 -BuildRequires: cairo-devel >= 1.4.0 +BuildRequires: cairo-devel >= 1.6.0 %{?with_cups:BuildRequires: cups-devel} BuildRequires: docbook-dtd412-xml BuildRequires: docbook-style-xsl BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.16.1 +BuildRequires: glib2-devel >= 1:2.18.0 %{?with_apidocs:BuildRequires: gtk-doc >= 1.8} BuildRequires: gtk-doc-automake >= 1.8 +BuildRequires: jasper-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel @@ -69,13 +67,15 @@ BuildRequires: xorg-lib-libXrandr-devel BuildRequires: xorg-lib-libXrender-devel Requires: atk >= 1:1.22.0 -Requires: cairo >= 1.4.0 -Requires: glib2 >= 1:2.16.1 +Requires: cairo >= 1.6.0 +Requires: glib2 >= 1:2.18.0 Requires: pango >= 1:1.20.0 %if %{with cups} # cups is used by default if gtk+ is built with cups Suggests: %{name}-cups = %{epoch}:%{version}-%{release} %endif +Provides: gail = 1.23.0 +Obsoletes: gail Obsoletes: gtk2 # [EMAIL PROTECTED] vs. [EMAIL PROTECTED] Conflicts: glibc-misc < 6:2.7 @@ -96,7 +96,7 @@ %endif %description -GTK+, which stands for the Gimp ToolKit, is a library for creating +GTK+, which stands for the GIMP ToolKit, is a library for creating graphical user interfaces for the X Window System. It is designed to be small, efficient, and flexible. GTK+ is written in C with a very object-oriented approach. GDK (part of GTK+) is a drawing toolkit @@ -124,7 +124,7 @@ Libreria X scritta per GIMP. Viene usata da diversi programmi. %description -l pl.UTF-8 -GTK+, która to biblioteka stała się podstawą programu Gimp, zawiera +GTK+, która to biblioteka stała się podstawą programu GIMP, zawiera funkcje do tworzenia graficznego interfejsu użytkownika pod X Window. Była tworzona z założeniem żeby była mała, efektywna i wygodna. GTK+ jest napisane w C z podejściem zorientowanym bardzo obiektowo. GDK @@ -150,7 +150,7 @@ Group: X11/Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: atk-devel >= 1:1.22.0 -Requires: glib2-devel >= 1:2.16.1 +Requires: glib2-devel >= 1:2.18.0 Requires: pango-devel >= 1:1.20.0 Requires: xorg-lib-libX11-devel Requires: xorg-lib-libXcursor-devel @@ -160,6 +160,8 @@ Requires: xorg-lib-libXinerama-devel Requires: xorg-lib-libXrandr-devel Requires: xorg-lib-libXrender-devel +Provides: gail-devel = 1.23.0 +Obsoletes: gail-devel Obsoletes: gtk2-devel %description devel @@ -173,6 +175,8 @@ Summary(pl.UTF-8): Biblioteki statyczne GTK+ Group: X11/Development/Libraries Requires: %{name}-devel = %{epoch}:%{version}-%{release} +Provides: gail-static = 1.23.0 +Obsoletes: gail-static %description static GTK+ static libraries. @@ -185,6 +189,8 @@ Summary(pl.UTF-8): Dokumentacja API GTK+ Group: Documentation Requires: gtk-doc-common +Provides: gail-static = 1.23.0 +Obsoletes: gail-apidocs %description apidocs GTK+ API documentation. @@ -219,8 +225,7 @@ %prep %setup -q -n gtk+-%{version} %patch0 -p1 -%{?with_macmenu:%patch1 -p0} -%patch2 -p1 +#%%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -277,7 +282,7 @@ # for various GTK+2 modules install -d $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules -rm -r $RPM_BUILD_ROOT%{_datadir}/locale/az_IR +rm -r $RPM_BUILD_ROOT%{_datadir}/locale/{az_IR,[EMAIL PROTECTED] [ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \ mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} @@ -319,6 +324,8 @@ %attr(755,root,root) %{_bindir}/gtk-demo %attr(755,root,root) %{_bindir}/gtk-query-immodules-2.0%{pqext} %attr(755,root,root) %{_bindir}/gtk-update-icon-cache +%attr(755,root,root) %{_libdir}/libgailutil.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgailutil.so.18 %attr(755,root,root) %{_libdir}/libgdk-x11-2.0.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgdk-x11-2.0.so.0 %attr(755,root,root) %{_libdir}/libgdk_pixbuf-2.0.so.*.*.* @@ -336,6 +343,8 @@ %dir %{_libdir}/gtk-2.0/%{abivers}/immodules %dir %{_libdir}/gtk-2.0/%{abivers}/loaders %dir %{_libdir}/gtk-2.0/%{abivers}/printbackends +%attr(755,root,root) %{_libdir}/gtk-2.0/modules/libferret.so +%attr(755,root,root) %{_libdir}/gtk-2.0/modules/libgail.so %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/engines/libpixmap.so %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/immodules/im-*.so %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/loaders/libpixbufloader-*.so @@ -366,18 +375,22 @@ %doc ChangeLog %attr(755,root,root) %{_bindir}/gdk-pixbuf-csource %attr(755,root,root) %{_bindir}/gtk-builder-convert +%attr(755,root,root) %{_libdir}/libgailutil.so %attr(755,root,root) %{_libdir}/libgdk-x11-2.0.so %attr(755,root,root) %{_libdir}/libgdk_pixbuf-2.0.so %attr(755,root,root) %{_libdir}/libgdk_pixbuf_xlib-2.0.so %attr(755,root,root) %{_libdir}/libgtk-x11-2.0.so +%{_libdir}/libgailutil.la %{_libdir}/libgdk-x11-2.0.la %{_libdir}/libgdk_pixbuf-2.0.la %{_libdir}/libgdk_pixbuf_xlib-2.0.la %{_libdir}/libgtk-x11-2.0.la +%{_includedir}/gail-1.0 %{_includedir}/gtk-2.0 %{_includedir}/gtk-unix-print-2.0 %{_aclocaldir}/gtk-2.0.m4 %{_libdir}/gtk-2.0/include +%{_pkgconfigdir}/gail.pc %{_pkgconfigdir}/gdk-2.0.pc %{_pkgconfigdir}/gdk-pixbuf-2.0.pc %{_pkgconfigdir}/gdk-pixbuf-xlib-2.0.pc @@ -391,6 +404,7 @@ %if %{with static_libs} %files static %defattr(644,root,root,755) +%{_libdir}/libgailutil.a %{_libdir}/libgdk-x11-2.0.a %{_libdir}/libgdk_pixbuf-2.0.a %{_libdir}/libgdk_pixbuf_xlib-2.0.a @@ -400,6 +414,7 @@ %if %{with apidocs} %files apidocs %defattr(644,root,root,755) +%{_gtkdocdir}/gail-libgail-util %{_gtkdocdir}/gdk %{_gtkdocdir}/gdk-pixbuf %{_gtkdocdir}/gtk @@ -421,14 +436,54 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.284 2008/09/07 10:56:51 patrys +- 2.14.1 +- merged from DEVEL + +Revision 1.280.2.11 2008/09/07 10:53:55 patrys +- 2.14.1 + +Revision 1.280.2.10 2008/08/19 11:25:16 patrys +- 2.13.7 + +Revision 1.280.2.9 2008/08/06 08:47:07 patrys +- 2.13.6 + +Revision 1.280.2.8 2008/08/04 13:08:22 patrys +- drop macmenu + +Revision 1.280.2.7 2008/07/23 14:38:32 patrys +- 2.13.5 + +Revision 1.280.2.6 2008/07/05 23:46:31 megabajt +- updated to 2.13.4 + Revision 1.283 2008/07/01 20:14:15 megabajt - updated to 2.12.11 Revision 1.282 2008/06/05 10:10:27 arekm - rel 2; drop [EMAIL PROTECTED] +Revision 1.280.2.5 2008/06/17 14:51:32 patrys +- BR: glib 2.17.1 + +Revision 1.280.2.4 2008/06/14 12:16:49 megabajt +- updated to 2.13.3 + +Revision 1.280.2.3 2008-06-13 21:50:37 megabajt +- updated to 2.13.2 +- unified GIMP name +- drop [EMAIL PROTECTED] locale + +Revision 1.280.2.2 2008-06-05 11:09:20 patrys +- 2.13.1 + Revision 1.281 2008-06-04 21:03:56 megabajt - updated to 2.12.10 + +Revision 1.280.2.1 2008-05-14 13:06:14 patrys +- 2.13.0 +- gail.spec is now obsolete (part of GTK+) Revision 1.280 2008-03-31 20:02:28 glen - release 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gtk+2.spec?r1=1.283&r2=1.284&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
