diff --git a/.cvsignore b/.cvsignore index 0f5862f..1ebd9c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -file-roller-2.22.1.tar.bz2 +file-roller-2.23.1.tar.bz2 diff --git a/file-roller-gio.patch b/file-roller-gio.patch deleted file mode 100644 index dfb8bad..0000000 --- a/file-roller-gio.patch +++ /dev/null @@ -1,98 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 2210) -+++ configure.in (working copy) -@@ -18,13 +18,13 @@ - dnl - dnl ========================================================================== - --GLIB_REQUIRED=2.12.0 -+GLIB_REQUIRED=2.15.0 - GTK_REQUIRED=2.10.0 - LIBGNOME_REQUIRED=2.6.0 - LIBGNOMEUI_REQUIRED=2.6.0 - GNOME_VFS_REQUIRED=2.10.0 - LIBGLADE_REQUIRED=2.4.0 --NAUTILUS_REQUIRED=2.10.0 -+NAUTILUS_REQUIRED=2.22.1 - - AC_SUBST(GLIB_REQUIRED) - AC_SUBST(GTK_REQUIRED) -@@ -38,6 +38,7 @@ - - PKG_CHECK_MODULES(FR, \ - glib-2.0 >= $GLIB_REQUIRED \ -+ gio-2.0 >= $GLIB_REQUIRED \ - gthread-2.0 \ - gtk+-2.0 >= $GTK_REQUIRED \ - libgnome-2.0 >= $LIBGNOME_REQUIRED \ -@@ -56,8 +57,8 @@ - - if test x"$enable_nautilus_actions" != xno; then - if pkg-config --atleast-version=$NAUTILUS_REQUIRED libnautilus-extension; then -- NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gnome-vfs-2.0` -- NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gnome-vfs-2.0` -+ NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gio-2.0` -+ NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gio-2.0` - build_nautilus_actions=yes - fi - fi -Index: nautilus/nautilus-fileroller.c -=================================================================== ---- nautilus/nautilus-fileroller.c (revision 2210) -+++ nautilus/nautilus-fileroller.c (working copy) -@@ -24,9 +24,7 @@ - #include - #include - #include --#include --#include --#include -+#include - #include - #include - #include -@@ -204,34 +202,19 @@ - return NULL; - - for (scan = files; scan; scan = scan->next) { -- NautilusFileInfo *file = scan->data; -+ NautilusFileInfo *file = scan->data; - -- if (all_archives && ! is_archive (file)) -- all_archives = FALSE; -+ if ((all_archives = is_archive (file)) == FALSE) -+ break; - -+ if (can_write) { -+ NautilusFileInfo *parent; - -- if (can_write) { -- char *parent_uri; -- GnomeVFSFileInfo *info; -- GnomeVFSResult result; -+ parent = nautilus_file_info_get_parent_info (file); -+ can_write = nautilus_file_info_can_write (parent); -+ } -+ } - -- parent_uri = nautilus_file_info_get_parent_uri (file); -- info = gnome_vfs_file_info_new (); -- -- result = gnome_vfs_get_file_info (parent_uri, -- info, -- (GNOME_VFS_FILE_INFO_FOLLOW_LINKS -- | GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS)); -- if ((result == GNOME_VFS_OK) && (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS)) -- can_write = (info->permissions & GNOME_VFS_PERM_ACCESS_WRITABLE) || (info->permissions & GNOME_VFS_PERM_USER_WRITE); -- -- gnome_vfs_file_info_unref (info); -- g_free (parent_uri); -- } -- } -- -- /**/ -- - one_item = (files != NULL) && (files->next == NULL); - one_archive = one_item && all_archives; - diff --git a/file-roller.spec b/file-roller.spec index e14d0a9..71344a3 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -10,14 +10,12 @@ Summary: File Roller is a tool for viewing and creating archives Name: file-roller -Version: 2.22.1 +Version: 2.23.1 Release: 1%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://download.gnome.org/sources/file-roller/ -Source: http://download.gnome.org/sources/file-roller/2.22/file-roller-%{version}.tar.bz2 -# http://bugzilla.gnome.org/show_bug.cgi?id=501542 -Patch0: file-roller-gio.patch +Source: http://download.gnome.org/sources/file-roller/2.23/file-roller-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -52,7 +50,6 @@ such as tar files. %prep %setup -q -%patch0 -p0 -b .gio autoreconf @@ -131,6 +128,9 @@ fi %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Thu Apr 24 2008 Matthias Clasen - 2.23.1-1 +- Update to 2.23.1 + * Mon Apr 7 2008 Matthias Clasen - 2.22.1-1 - Update to 2.22.1 diff --git a/sources b/sources index 7e9703c..a797dfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -48e8f1328be37c819e41b02af5a1b558 file-roller-2.22.1.tar.bz2 +2f71a27cdc031a5d137d23ba84ac3a38 file-roller-2.23.1.tar.bz2