- merged from DEVEL

Changed files:
    file-roller-desktop.patch -> 1.4
    file-roller.spec -> 1.75

diff --git a/file-roller-desktop.patch b/file-roller-desktop.patch
index 423f00c01c79dba3ee34a29ad8a4c4b48ad765fa..82ad86dc625d74f64ea41127a292ad20145f6dd9 100644 (file)
--- a/file-roller-desktop.patch
+++ b/file-roller-desktop.patch
@@ -1,11 +1,11 @@
-diff -urN file-roller-2.8.3.orig/file-roller.desktop.in file-roller-2.8.3/file-roller.desktop.in
---- file-roller-2.8.3.orig/data/file-roller.desktop.in 2004-11-17 12:12:09.932840200 +0100
-+++ file-roller-2.8.3/data/file-roller.desktop.in      2004-11-17 12:13:31.104500232 +0100
+diff -aurN file-roller-2.13.90.orig/data/file-roller.desktop.in file-roller-2.13.90/data/file-roller.desktop.in
+--- file-roller-2.13.90.orig/data/file-roller.desktop.in       2006-01-30 22:18:28.000000000 +0100
++++ file-roller-2.13.90/data/file-roller.desktop.in    2006-01-31 16:03:54.270754000 +0100
 @@ -1,7 +1,7 @@
  [Desktop Entry]
  _Name=Archive Manager
  _Comment=Create and modify an archive
--Categories=GNOME;Application;System;Utility;
+-Categories=GTK;GNOME;Application;Utility;
 +Categories=GTK;GNOME;Utility;Archiving;
  Encoding=UTF-8
  Exec=file-roller %F

diff --git a/file-roller.spec b/file-roller.spec
index 858aca423375465b60ec7c8bcaa34b4c9cb689e5..881fbcb251643e7358d252031468c6a1f528a17a 100644 (file)
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -2,12 +2,12 @@ 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.12.3
+Version:       2.14.0
 Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/file-roller/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: a6d7fcc3417bd23556261223c4ad77ee
+Source0:       http://ftp.gnome.org/pub/gnome/sources/file-roller/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 500a12d54a6c1211a92982171d30db16
 Patch0:                %{name}-desktop.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.10.0
@@ -126,9 +126,7 @@ EOF
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/file-roller
-%attr(755,root,root) %{_libdir}/bonobo/*.so
 %attr(755,root,root) %{_libdir}/nautilus/extensions-1.0/*.so
-%{_libdir}/bonobo/servers/*.server
 %{_datadir}/file-roller
 %{_desktopdir}/*
 %{_pixmapsdir}/file-roller.png