From d9ad8594a00282b165eb2d589b6b61684a7f4f13cf37b754d26d03c91127d71a Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 21 Dec 2011 04:57:28 +0000
Subject: [PATCH] Accepting request 97307 from
 home:vuntz:branches:GNOME:Factory

Update to 3.3.1

OBS-URL: https://build.opensuse.org/request/show/97307
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=119
---
 file-roller-3.2.2.tar.bz2 |  3 ---
 file-roller-3.3.1.tar.xz  |  3 +++
 file-roller.changes       | 16 ++++++++++++++++
 file-roller.spec          | 18 +++++++-----------
 4 files changed, 26 insertions(+), 14 deletions(-)
 delete mode 100644 file-roller-3.2.2.tar.bz2
 create mode 100644 file-roller-3.3.1.tar.xz

diff --git a/file-roller-3.2.2.tar.bz2 b/file-roller-3.2.2.tar.bz2
deleted file mode 100644
index 84a0c01..0000000
--- a/file-roller-3.2.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9944a9c1509d81c65a255a066645bd8cc88199c6dc476e05f135758d5235440
-size 2164619
diff --git a/file-roller-3.3.1.tar.xz b/file-roller-3.3.1.tar.xz
new file mode 100644
index 0000000..807e5d6
--- /dev/null
+++ b/file-roller-3.3.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af5219124dc916d12eedd4f63bbc1b26b63cb19f12f6e7f06a8678b30e9cb780
+size 1480296
diff --git a/file-roller.changes b/file-roller.changes
index c2c21f6..e013b3f 100644
--- a/file-roller.changes
+++ b/file-roller.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Dec 20 09:54:11 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.3.1:
+  + Updated the user manual
+  + Change strings to use ellipsis (bgo#666447)
+  + Improvement for string in password dialog (bgo#666297) and
+    archive properties dialog (bgo#666295)
+  + Fixed padding in the request and error dialogs (bgo#666075)
+  + Bad string in the error dialog 'Could not rename the file'
+    (bgo#666075)
+  + Improve string in error dialog (bgo#666070)
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+
 -------------------------------------------------------------------
 Tue Nov 15 10:09:22 UTC 2011 - vuntz@opensuse.org
 
diff --git a/file-roller.spec b/file-roller.spec
index 1559734..039a36c 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -16,15 +16,14 @@
 #
 
 
-
 Name:           file-roller
-Version:        3.2.2
-Release:        1
-License:        GPLv2+
+Version:        3.3.1
+Release:        0
 Summary:        An Archive Manager for GNOME
-Url:            http://fileroller.sourceforge.net
+License:        GPL-2.0+
 Group:          Productivity/Archiving/Compression
-Source:         http://download.gnome.org/sources/file-roller/3.2/%{name}-%{version}.tar.bz2
+Url:            http://fileroller.sourceforge.net
+Source:         http://download.gnome.org/sources/file-roller/3.3/%{name}-%{version}.tar.xz
 # Needed for directory ownership
 BuildRequires:  dbus-1
 BuildRequires:  fdupes
@@ -32,6 +31,8 @@ BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libnautilus-extension)
 BuildRequires:  pkgconfig(gtk+-3.0)
@@ -73,9 +74,7 @@ and modify archives, view the contents of an archive, view a file
 contained in the archive, and extract files from the archive.
 
 %package -n nautilus-file-roller
-License:        GPLv2+
 Summary:        An Archive Manager for GNOME - Nautilus extension
-Group:          Productivity/Archiving/Compression
 Requires:       %{name} = %{version}
 Supplements:    packageand(file-roller:nautilus)
 
@@ -123,9 +122,6 @@ rm %{buildroot}%{_libdir}/*/*/*.*a
 %dir %{_datadir}/gnome/help/
 %dir %{_datadir}/gnome/help/%{name}/
 %doc %{_datadir}/gnome/help/%{name}/C/
-%dir %{_datadir}/omf/
-%dir %{_datadir}/omf/%{name}/
-%doc %{_datadir}/omf/%{name}/%{name}-C.omf
 %{_bindir}/file-roller
 %{_libexecdir}/file-roller/
 %{_libexecdir}/file-roller-server