- merged from DEVEL and updated to 2.8.0

- run /usr/bin/update-desktop-database in %%post and %%postun

Changed files:
    file-roller.spec -> 1.53

diff --git a/file-roller.spec b/file-roller.spec
index 891e15278898b1c7524a2d379961a0e177c52f9b..237ed180b9d733e1f2e3cbef08b4bed688b18d4e 100644 (file)
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -2,27 +2,26 @@ Summary:      An archive manager for GNOME
 Summary(pl):   Zarz±dca archiwów dla GNOME
 Summary(pt_BR):        Gerenciador de arquivos compactados para o GNOME
 Name:          file-roller
-Version:       2.6.2
-Release:       2
+Version:       2.8.0
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 88c6441d286c8f0810a37a3f3107f985
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5: 4a26cdecb3e2ed0f94e34ef5995fa890
 Patch0:                %{name}-gzip-mime.patch
-Patch1:                %{name}-locale-names.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.6.2
+BuildRequires: GConf2-devel >= 2.7.92
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gnome-vfs2-devel >= 2.6.1.1
-BuildRequires: gtk+2-devel >= 2:2.4.3
+BuildRequires: gnome-vfs2-devel >= 2.8.0
+BuildRequires: gtk+2-devel >= 2:2.4.4
 BuildRequires: libglade2-devel >= 1:2.4.0
-BuildRequires: libgnomeui-devel >= 2.6.1.1
+BuildRequires: libgnomeui-devel >= 2.8.0
 BuildRequires: libtool
 BuildRequires: rpm-build >= 4.1-10
 Requires(post):        GConf2
-Requires(post):        scrollkeeper
-Requires:      gnome-vfs2 >= 2.6.1.1
+Requires(post,postun): scrollkeeper
+Requires:      gnome-vfs2 >= 2.8.0
 Requires:      unzip
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,9 +71,6 @@ pacote e extrair os arquivos de um pacote.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-mv po/{no,nb}.po
 
 %build
 rm -f missing
@@ -96,16 +92,23 @@ rm -rf $RPM_BUILD_ROOT
        omf_dest_dir=%{_omf_dest_dir}/%{name} \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome
 
 %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)