This commit is contained in:
Matthias Clasen 2011-02-01 21:48:41 -05:00
parent 0574055d41
commit a6e3e5366f
3 changed files with 14 additions and 18 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ gtk+-2.90.5.tar.bz2
/gtk+-2.99.0.tar.bz2 /gtk+-2.99.0.tar.bz2
/gtk+-2.99.1.tar.bz2 /gtk+-2.99.1.tar.bz2
/gtk+-2.99.2.tar.bz2 /gtk+-2.99.2.tar.bz2
/gtk+-2.99.3.tar.bz2

View File

@ -10,27 +10,23 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk3 Name: gtk3
Version: 2.99.2 Version: 2.99.3
Release: 2%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.gtk.org URL: http://www.gtk.org
#VCS: git:git://git.gnome.org/gtk+ #VCS: git:git://git.gnome.org/gtk+
Source: http://download.gnome.org/sources/gtk+/2.99/gtk+-%{version}.tar.bz2 Source: http://download.gnome.org/sources/gtk+/2.99/gtk+-%{version}.tar.bz2
Source3: im-cedilla.conf Source1: im-cedilla.conf
BuildRequires: gnome-common autoconf automake intltool gettext BuildRequires: gnome-common autoconf automake intltool gettext
# Fixes crash of gnome-settings-daemon when plugging in USB media, among other things
Patch0: fix-gtk-show-uri-crash.patch
#Patch2: 0001-New-tooltip-style.patch
BuildRequires: atk-devel >= %{atk_version} BuildRequires: atk-devel >= %{atk_version}
BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: cairo-gobject-devel >= %{cairo_version} BuildRequires: cairo-gobject-devel >= %{cairo_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gdk-pixbuf2-devel BuildRequires: gdk-pixbuf2-devel
BuildRequires: gtk2-devel
BuildRequires: libXi-devel BuildRequires: libXi-devel
BuildRequires: gettext BuildRequires: gettext
BuildRequires: gtk-doc BuildRequires: gtk-doc
@ -73,8 +69,8 @@ Requires: gtk3 = %{version}-%{release}
Requires: imsettings Requires: imsettings
%description immodules %description immodules
The gtk3-immodules package contains standalone input methods that are shipped The gtk3-immodules package contains standalone input methods that
as part of GTK+ 3. are shipped as part of GTK+ 3.
%package immodule-xim %package immodule-xim
Summary: XIM support for GTK+ Summary: XIM support for GTK+
@ -114,8 +110,6 @@ widget toolkit.
%prep %prep
%setup -q -n gtk+-%{version} %setup -q -n gtk+-%{version}
%patch0 -p1 -b .gtk-show-uri-gdk-screen
#%patch2 -p1 -b .fresh-tooltips
%build %build
@ -125,6 +119,7 @@ autoreconf -f
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
%configure $CONFIGFLAGS \ %configure $CONFIGFLAGS \
--with-xinput \ --with-xinput \
--enable-gtk2-dependency \
) )
# fight unused direct deps # fight unused direct deps
@ -150,7 +145,7 @@ make install DESTDIR=$RPM_BUILD_ROOT \
) )
# Input method frameworks want this # Input method frameworks want this
install -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
# Remove unpackaged files # Remove unpackaged files
rm $RPM_BUILD_ROOT%{_libdir}/*.la rm $RPM_BUILD_ROOT%{_libdir}/*.la
@ -192,7 +187,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%defattr(-, root, root, -) %defattr(-, root, root, -)
%doc AUTHORS COPYING NEWS README %doc AUTHORS COPYING NEWS README
%{_bindir}/gtk-query-immodules-3.0* %{_bindir}/gtk-query-immodules-3.0*
%exclude %{_bindir}/gtk-update-icon-cache
%{_libdir}/libgtk-3.0.so.* %{_libdir}/libgtk-3.0.so.*
%{_libdir}/libgdk-3.0.so.* %{_libdir}/libgdk-3.0.so.*
%{_libdir}/libgailutil-3.0.so.* %{_libdir}/libgailutil-3.0.so.*
@ -237,7 +231,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_includedir}/* %{_includedir}/*
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%exclude %{_bindir}/gtk-builder-convert
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/*
%{_bindir}/gtk3-demo %{_bindir}/gtk3-demo
%{_datadir}/gtk-3.0 %{_datadir}/gtk-3.0
@ -246,9 +239,11 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%files devel-docs %files devel-docs
%defattr(-, root, root, -) %defattr(-, root, root, -)
%{_datadir}/gtk-doc %{_datadir}/gtk-doc
%exclude %{_mandir}/man1/gtk-builder-convert.1.gz
%changelog %changelog
* Tue Feb 1 2011 Matthias Clasen <mclasen@redhat.com> - 2.99.3-1
- Update to 2.99.3
* Mon Jan 24 2011 Dan Williams <dcbw@redhat.com> 2.99.2-2 * Mon Jan 24 2011 Dan Williams <dcbw@redhat.com> 2.99.2-2
- Fix bug in gtk_show_uri() which caused crashes when plugging in USB drives - Fix bug in gtk_show_uri() which caused crashes when plugging in USB drives

View File

@ -1 +1 @@
e727b2bc0d17182d41ddd90a83285b0e gtk+-2.99.2.tar.bz2 3464064d36a212b1c051eff59af7a7e9 gtk+-2.99.3.tar.bz2