summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--gtk3.spec18
-rw-r--r--sources2
3 files changed, 14 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 29d987e..971fb03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
gtk+-2.90.5.tar.bz2
/gtk+-2.90.7.tar.bz2
/gtk+-2.91.0.tar.bz2
+/gtk+-2.91.1.tar.bz2
diff --git a/gtk3.spec b/gtk3.spec
index e8cc5da..38964a2 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -10,8 +10,8 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk3
-Version: 2.91.0
-Release: 2%{?dist}
+Version: 2.91.1
+Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
@@ -110,7 +110,7 @@ widget toolkit.
%prep
%setup -q -n gtk+-%{version}
%patch0 -p1 -b .system-python
-%patch2 -p1 -b .fresh-tooltips
+#%patch2 -p1 -b .fresh-tooltips
%build
@@ -146,7 +146,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0
# Make cleaned-up versions of tutorials, examples, and faq for installation
#
mkdir -p tmpdocs
-cp -aR docs/tutorial/html tmpdocs/tutorial
cp -aR docs/faq/html tmpdocs/faq
for dir in examples/* ; do
@@ -170,6 +169,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/*/*.la
rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/*/*.la
+rm $RPM_BUILD_ROOT%{_bindir}/hello-world
+rm $RPM_BUILD_ROOT%{_bindir}/window-default
+
touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules
@@ -178,6 +180,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/immodules
%post
/sbin/ldconfig
gtk-query-immodules-3.0-%{__isa_bits} --update-cache
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%post immodules
gtk-query-immodules-3.0-%{__isa_bits} --update-cache
@@ -190,6 +193,7 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
if [ $1 -gt 0 ]; then
gtk-query-immodules-3.0-%{__isa_bits} --update-cache
fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%postun immodules
gtk-query-immodules-3.0-%{__isa_bits} --update-cache
@@ -220,6 +224,7 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%ghost %{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
%{_mandir}/man1/gtk-query-immodules-3.0.1.gz
%{_mandir}/man1/gtk-update-icon-cache-3.0.1.gz
+%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
%files immodules
%defattr(-, root, root, -)
@@ -256,11 +261,12 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%defattr(-, root, root, -)
%{_datadir}/gtk-doc
%{_mandir}/man1/gtk-builder-convert-3.0.1.gz
-%doc tmpdocs/tutorial
%doc tmpdocs/faq
-%doc tmpdocs/examples
%changelog
+* Wed Oct 20 2010 Richard Hughes <richard@hughsie.com> 2.91.1-1
+- Update to 2.91.1
+
* Tue Oct 12 2010 Matthias Clasen <mclasen@redhat.com> 2.91.0-2
- Fix a crash in the tooltip code
diff --git a/sources b/sources
index b2f4afb..bf57641 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16f44e92da5ce322e83f13baa25a5f50 gtk+-2.91.0.tar.bz2
+efd1dd3914ef9b892fabddad43cc74e6 gtk+-2.91.1.tar.bz2
bgstack15