checked in

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=57

file-roller-2.28.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:499fe835b297720f4e4054b4ab34a3fb619c3460c5da82b1519d9b86aa2f3ac2
+size 1735875

file-roller-2.29.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ea24599f4ad50a8cec1ab360f15f0872cd3bc144dacf15002e77b96161036d0
-size 1768411

file-roller-fix-build.patch

@@ -1,28 +0,0 @@
-commit 7f9b3b55a28ae2c5c39913f6137064931406c381
-Author: Bastien Nocera <hadess@hadess.net>
-Date:   Tue Dec 1 15:18:25 2009 +0000
-
-    Fix dbus-glib-1 check in configure
-    
-    DBUS_CFLAGS and DBUS_LIBS were never set through AC_SUBST. Clean
-    up the check using PKG_CHECK_MODULES instead.
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=603492
-
-diff --git a/configure.ac b/configure.ac
-index a7d31d9..9f48de0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -96,10 +96,9 @@ AC_ARG_ENABLE(packagekit,
- 	      [AC_HELP_STRING([--disable-packagekit],[build without PackageKit support])],,
- 	      [enable_packagekit=yes])
- if test "x$enable_packagekit" != "xno"; then
--	if pkg-config dbus-glib-1; then
-+	PKG_CHECK_MODULES(DBUS, dbus-glib-1, has_dbus_glib=yes, has_dbug_glib=no)
-+	if test "x$has_dbus_glib" = "xyes"; then
- 		AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit installer])
--		DBUS_CFLAGS = `pkg-config --cflags dbus-glib-1`
--		DBUS_LIBS = `pkg-config --libs dbus-glib-1`
-         else
- 		enable_packagekit=no
-         fi

file-roller.changes

@@ -1,35 +1,3 @@
--------------------------------------------------------------------
-Wed Dec  2 22:53:42 CET 2009 - vuntz@opensuse.org
-
-- Update to version 2.29.2:
-  + New features and user visible changes:
-    - Use the eggfileformatchooser widget to select the file format
-  + Updated translations.
-- Changes from version 2.29.1:
-  + New features and user visible changes
-    - Install the missing packages if a command is not available
-      (bgo#482560)
-  + Bugs fixed:
-    - bgo#590606: drag and drop bug makes file-roller UI unusable
-      as a whole
-    - bgo#600131: encrypt_header is left enabled when creating zip
-      archives
-    - bgo#580624: Visual refresh issues while browsing into the
-      directories included in the archive
-    - bgo#326017: 4th and 5th mouse buttons should control back /
-      forward
-    - bgo#590027: file-roller will not update files
-  + Updated translations.
-- Add file-roller-fix-build.patch to fix build.
-- Create a nautilus-file-roller subpackage, to make file-roller
-  installable without nautilus.
-
--------------------------------------------------------------------
-Sat Nov 14 02:17:26 CET 2009 - vuntz@opensuse.org
-
-- Update to version 2.28.1:
-  + Updated translations.
-
 -------------------------------------------------------------------
 Tue Sep 22 13:59:46 CEST 2009 - dimstar@opensuse.org
 

file-roller.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package file-roller (Version 2.29.2)
+# spec file for package file-roller (Version 2.28.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,15 +18,13 @@
 
 
 Name:           file-roller
-Version:        2.29.2
+Version:        2.28.0
 Release:        1
 License:        GPL v2 or later
 Summary:        An Archive Manager for GNOME
 Url:            http://fileroller.sourceforge.net
 Group:          Productivity/Archiving/Compression
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM file-roller-fix-build.patch vuntz@opensuse.org -- Taken from git
-Patch0:         file-roller-fix-build.patch
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
 BuildRequires:  glib2-devel
@@ -36,8 +34,6 @@ BuildRequires:  intltool
 BuildRequires:  nautilus-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-# Needed for patch0 file-roller-fix-build.patch
-BuildRequires:  gnome-common
 Requires:       %{name}-lang = %{version}
 # Formats that we really want to support by default
 Requires:       bzip2
@@ -72,30 +68,38 @@ DocDir:         %{_defaultdocdir}
 %description
 File Roller is an archive manager for GNOME.  With it, you can create
 and modify archives, view the contents of an archive, view a file
-contained in the archive, and extract files from the archive.
+contained in the archive, and extract files from the archive. File
+Roller is a front-end (a graphical interface) for archiving programs
+like tar and zip. The supported file types are:
 
-%package -n nautilus-file-roller
+* Tar archives uncompressed (.tar) or compressed with
-License:        GPL v2 or later
-Summary:        An Archive Manager for GNOME - Nautilus extension
-Group:          Productivity/Archiving/Compression
-Requires:       %{name} = %{version}
-Supplements:    packageand(file-roller:nautilus)
 
-%description -n nautilus-file-roller
+- gzip (.tar.gz, .tgz)
-File Roller is an archive manager for GNOME. With it, you can create
-and modify archives, view the contents of an archive, view a file
-contained in the archive, and extract files from the archive.
 
-This package contains a plugin to integrate File Roller into Nautilus.
+- bzip (.tar.bz, .tbz)
+
+- bzip2 (.tar.bz2, .tbz2)
+
+- compress (.tar.Z, .taz)
+
+- lzop (.tar.lzo, .tzo)
+
+* Zip archives (.zip)
+
+* Jar archives (.jar, .ear, .war)
+
+* Lha archives (.lzh)
+
+* Rar archives (.rar)
+
+* Single files compressed with gzip, bzip, bzip2, compress, lzop
 
 %lang_package
 %prep
 %setup -q
 translation-update-upstream
-%patch0 -p1
 
 %build
-NOCONFIGURE=1 gnome-autogen.sh
 %configure\
 	--disable-schemas-install\
 	--disable-scrollkeeper
@@ -103,12 +107,10 @@ NOCONFIGURE=1 gnome-autogen.sh
 
 %install
 %makeinstall
-%if 0%{?suse_version} <= 1120
-%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
-%endif
 %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving
 %find_lang %{name}
 %find_gconf_schemas
+cat %{name}.schemas_list >%{name}.lst
 rm %{buildroot}%{_libdir}/*/*/*.*a
 %fdupes %{buildroot}
 
@@ -131,18 +133,15 @@ if test -x usr/bin/update-mime-database ; then
   usr/bin/update-mime-database usr/share/mime >/dev/null
 fi
 
-%files -f %{name}.schemas_list
+%files -f %{name}.lst
 %defattr(-, root, root)
 %doc AUTHORS NEWS README COPYING
 %{_bindir}/file-roller
-%{_libexecdir}/file-roller/
+%{_libexecdir}/file-roller
 %{_datadir}/applications/*.desktop
-%{_datadir}/file-roller/
+%{_datadir}/file-roller
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
-
-%files -n nautilus-file-roller
-%defattr(-, root, root)
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %files lang -f %name.lang