- merged to HEAD, one more time STBR

[packages/gthumb.git] / gthumb.spec

diff --git a/gthumb.spec b/gthumb.spec
index 24eeeb531271c9f2b9645aad694214c11d00567b..3b85dfb2481f8796956c8c57b91dcd4d4d97d923 100644 (file)
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -1,32 +1,36 @@
 Summary:       An image viewer and browser for GNOME
 Summary(pl):   Przegl±darka obrazków dla GNOME
 Name:          gthumb
-Version:       2.4.2
-Release:       2
+Version:       2.6.0
+Release:       1
 License:       GPL
 Vendor:                GNOME
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2
-# Source0-md5: 10d169253bca4d56ccd714eea8a93c8f
-Patch0:                %{name}-locale_names.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gthumb/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5: d78883f36fcc37219660fc87c0c0f1f2
 URL:           http://gthumb.sourceforge.net/
-BuildRequires: autoconf
+BuildRequires: GConf2-devel
+BuildRequires: ORBit2-devel
+BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: gnome-common >= 2.8.0
-BuildRequires: gnome-vfs2-devel >= 2.4.0
-BuildRequires: libexif-devel >= 1:0.5.12
-BuildRequires: libglade2-devel >= 2.0.1
-BuildRequires: libgnomeprintui-devel >= 2.4.0
-BuildRequires: libgnomeui-devel >= 2.4.0
+BuildRequires: gnome-vfs2-devel >= 2.6.0
+BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: intltool >= 0.21
+BuildRequires: libexif-devel >= 1:0.6.9
+BuildRequires: libglade2-devel >= 1:2.4.0
+BuildRequires: libgnomeprintui-devel >= 2.6.0
+BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: libgphoto2-devel >= 2.1.3
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.4.0
+Requires(post,postun): scrollkeeper
 Requires(post):        GConf2
-Requires(post):        scrollkeeper
-Requires:      libbonobo
+Requires:      libbonobo >= 2.6.0
+Requires:      gtk+2 >= 2:2.4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,9 +47,6 @@ w katalogi, drukowa
 
 %prep
 %setup -q
-%patch0 -p1
-
-mv po/{no,nb}.po
 sed -i -e 's/^Categories=Application;/Categories=GTK;GNOME;/' \
        data/gthumb.desktop.in
 
@@ -68,16 +69,23 @@ rm -rf $RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/*.{a,la}
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la}
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+umask 022
 /usr/bin/scrollkeeper-update
 %gconf_schema_install
+[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
 
-%postun        -p /usr/bin/scrollkeeper-update
+%postun
+umask 022
+/usr/bin/scrollkeeper-update
+[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -85,7 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/%{name}-image-viewer
 %attr(755,root,root) %{_libdir}/%{name}-catalog-view
-%{_libdir}/%{name}
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
+%attr(755,root,root) %{_libdir}/%{name}/lib*.so
+%attr(755,root,root) %{_libdir}/%{name}/modules/*.so
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/%{name}