2.91.3

devhelp.spec

@@ -5,8 +5,8 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 2.90.5
-Release: 6%{?dist}
+Version: 2.91.3
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: Development/Tools
@@ -15,17 +15,6 @@ URL: http://developer.imendio.com/projects/devhelp
 #VCS: git:git://git.gnome.org/devhelp
 Source: http://download.gnome.org/sources/devhelp/2.90/devhelp-%{version}.tar.bz2
 
-# upstream fixes
-Patch0: devhelp-gtk3.patch
-Patch1: 0001-pkgconfig-Require-webkitgtk-3.0-instead-of-webkit-3..patch
-Patch2: 0002-Use-double-quotes-for-including-dh-headers.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=629174
-# https://bugzilla.redhat.com/show_bug.cgi?id=624198
-Patch3: 0001-Fix-broken-schemas-file.patch
-Patch4: 0002-Fix-use-of-disabled_books.patch
-Patch5: devhelp-2.90.5-gdk-key.patch
-Patch6: 0001-GtkNotebookPage-has-been-removed-in-GTK-aa017fa.patch
-
 ### Dependencies ###
 
 Requires(pre): GConf2 >= 2.14
@@ -61,13 +50,6 @@ into other applications such as IDEs.
 
 %prep
 %setup -q -n devhelp-%{version}
-%patch0 -p1 -b .gtk3
-%patch1 -p1 -b .pkgconfig
-%patch2 -p1 -b .double-quotes
-%patch3 -p1 -b .schema
-%patch4 -p1 -b .disabled-books
-%patch5 -p1 -b .gdk_key
-%patch6 -p1 -b .GtkNotebookPage
 
 # force regeneration
 rm data/devhelp.schemas
@@ -96,10 +78,9 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books
 
-%find_lang devhelp
+rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%find_lang devhelp
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -150,11 +131,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 %files devel
 %defattr(-,root,root)
-%{_prefix}/include/devhelp-1.0
+%{_prefix}/include/devhelp-3.0
 %{_libdir}/libdevhelp*.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Dec  3 2010 Matthias Clasen <mclasen@redhat.com> - 2.91.3-1
+- Update to 2.91.3
+
 * Mon Nov 15 2010 Kalev Lember <kalev@smartlink.ee> - 2.90.5-6
 - Carry epoch over from F14 branch to preserve upgrade path
 - Backported upstream patches to fix build with latest gtk3