[packages/file-roller] - rename sr at ije locale to sr at ijekavian - updated BRs - added magic patch (fixes magic support, disab

[qboosh]

commit a1d63170483b9b961403649ac820870cb6ffb9e4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 6 17:38:13 2013 +0100

    - rename sr at ije locale to sr at ijekavian
    - updated BRs
    - added magic patch (fixes magic support, disabled by mistake)
    - release 2

 file-roller-magic.patch | 28 ++++++++++++++++++++++++++++
 file-roller.spec        | 19 +++++++++++++------
 2 files changed, 41 insertions(+), 6 deletions(-)
---
diff --git a/file-roller.spec b/file-roller.spec
index 81e6e2e..fa37f85 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -3,13 +3,14 @@ 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.6.3
-Release:	1
-License:	GPL v2
+Release:	2
+License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.6/%{name}-%{version}.tar.xz
 # Source0-md5:	6fdc21dfe47847125191a8ad8633871e
+Patch0:		%{name}-magic.patch
 URL:		http://www.gnome.org/
-BuildRequires:	autoconf >= 2.61
+BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
@@ -18,20 +19,24 @@ BuildRequires:	gtk+3-devel >= 3.4.0
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	json-glib-devel >= 0.14.0
 BuildRequires:	libarchive-devel >= 3.0.0
+BuildRequires:	libmagic-devel
 BuildRequires:	libnotify-devel >= 0.4.3
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2
 BuildRequires:	libxml2-progs
 BuildRequires:	nautilus-devel >= 2.26.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.601
-# libegg
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	yelp-tools
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk-update-icon-cache
 Requires:	glib2 >= 1:2.30.0
+Requires:	gtk+3 >= 3.4.0
 Requires:	hicolor-icon-theme
+Requires:	json-glib >= 0.14.0
+Requires:	libarchive >= 3.0.0
+Requires:	libnotify >= 0.4.3
 Requires:	nautilus-libs >= 2.26.0
 Suggests:	bzip2
 Suggests:	gzip
@@ -92,6 +97,7 @@ pacote e extrair os arquivos de um pacote.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -115,6 +121,7 @@ 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
 
@@ -135,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README README_COMMANDLINE
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README README_COMMANDLINE
 %attr(755,root,root) %{_bindir}/file-roller
 %attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libnautilus-fileroller.so
 %dir %{_libdir}/file-roller
diff --git a/file-roller-magic.patch b/file-roller-magic.patch
new file mode 100644
index 0000000..f3f8723
--- /dev/null
+++ b/file-roller-magic.patch
@@ -0,0 +1,28 @@
+--- 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/a1d63170483b9b961403649ac820870cb6ffb9e4