[packages/file-roller] Up to 3.10.0, magic patch not needed (fixed upstream)

[wiget]

commit 17fa215ec4b8593ade11e2cdf612b7d42b5011fa
Author: Artur Frysiak <artur at frysiak.net>
Date:   Tue Oct 1 20:50:33 2013 +0200

    Up to 3.10.0, magic patch not needed (fixed upstream)

 file-roller-magic.patch | 28 ----------------------------
 file-roller.spec        | 15 ++++++---------
 2 files changed, 6 insertions(+), 37 deletions(-)
---
diff --git a/file-roller.spec b/file-roller.spec
index 3422e8d..ab3658e 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -2,20 +2,20 @@ Summary:	An archive manager for GNOME
 Summary(pl.UTF-8):	Zarządca archiwów dla GNOME
 Summary(pt_BR.UTF-8):	Gerenciador de arquivos compactados para o GNOME
 Name:		file-roller
-Version:	3.8.3
+Version:	3.10.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.8/%{name}-%{version}.tar.xz
-# Source0-md5:	ff3229109799eaa2ee0b60fd4a8e23ca
-Patch0:		%{name}-magic.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.10/%{name}-%{version}.tar.xz
+# Source0-md5:	f630a6c520b1d4aff10b9e7612a31485
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake >= 1:1.11
+BuildRequires:	desktop-file-utils
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.30.0
-BuildRequires:	gtk+3-devel >= 3.6.0
+BuildRequires:	glib2-devel >= 1:2.36.0
+BuildRequires:	gtk+3-devel >= 3.9.3
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	json-glib-devel >= 0.14.0
 BuildRequires:	libarchive-devel >= 3.0.0
@@ -98,7 +98,6 @@ pacote e extrair os arquivos de um pacote.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -123,8 +122,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
 
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr at ije,sr at ijekavian}
-# the same locale as ur
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ur_PK
 
 %find_lang %{name} --with-gnome
 
diff --git a/file-roller-magic.patch b/file-roller-magic.patch
deleted file mode 100644
index f3f8723..0000000
--- a/file-roller-magic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- file-roller-3.6.3/src/fr-archive.c.orig	2012-11-25 12:53:27.000000000 +0100
-+++ file-roller-3.6.3/src/fr-archive.c	2013-01-06 17:29:09.217910387 +0100
-@@ -28,9 +28,6 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gio/gio.h>
--#if ENABLE_MAGIC
--#  include <magic.h>
--#endif
- #include "glib-utils.h"
- #include "file-utils.h"
- #include "gio-utils.h"
---- file-roller-3.6.3/src/glib-utils.c.orig	2012-09-28 11:19:18.000000000 +0200
-+++ file-roller-3.6.3/src/glib-utils.c	2013-01-06 17:29:09.834605567 +0100
-@@ -19,9 +19,13 @@
-  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include <config.h>
- #include <ctype.h>
- #include <string.h>
- #include <stdio.h>
-+#if ENABLE_MAGIC
-+#  include <magic.h>
-+#endif
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <glib/gprintf.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/file-roller.git/commitdiff/17fa215ec4b8593ade11e2cdf612b7d42b5011fa