SPECS (AC-branch): file-roller.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Tue May 16 16:56:09 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   file-roller.spec (1.74 -> 1.74.2.1) 

---- Diffs:

================================================================
Index: SPECS/file-roller.spec
diff -u SPECS/file-roller.spec:1.74 SPECS/file-roller.spec:1.74.2.1
--- SPECS/file-roller.spec:1.74	Wed Feb  8 16:35:02 2006
+++ SPECS/file-roller.spec	Tue May 16 18:56:04 2006
@@ -3,32 +3,32 @@
 Summary(pl):	Zarządca archiwów dla GNOME
 Summary(pt_BR):	Gerenciador de arquivos compactados para o GNOME
 Name:		file-roller
-Version:	2.12.3
+Version:	2.14.2
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/file-roller/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	a6d7fcc3417bd23556261223c4ad77ee
+Source0:	http://ftp.gnome.org/pub/gnome/sources/file-roller/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	4900dc4b2e4f0f173bd88cb5e6b9bde1
 Patch0:		%{name}-desktop.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.10.0
+BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-doc-utils >= 0.3.1-2
-BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
+BuildRequires:	gnome-vfs2-devel >= 2.14.0
 BuildRequires:	gtk+2-devel >= 2:2.8.0
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	libtool
-BuildRequires:	nautilus-devel >= 2.10.0-3
+BuildRequires:	nautilus-devel >= 2.14.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
 Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
-Requires:	gnome-vfs2 >= 2.10.0-2
+Requires:	gnome-vfs2 >= 2.14.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -97,7 +97,6 @@
 	omf_dest_dir=%{_omf_dest_dir}/%{name} \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.la
 rm -rf $RPM_BUILD_ROOT%{_datadir}/{mime-info,application-registry}
@@ -127,12 +126,10 @@
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/file-roller
-%attr(755,root,root) %{_libdir}/bonobo/*.so
 %attr(755,root,root) %{_libdir}/nautilus/extensions-1.0/*.so
-%{_libdir}/bonobo/servers/*.server
 %{_datadir}/file-roller
 %{_desktopdir}/*
-%{_pixmapsdir}/file-roller.png
+%{_iconsdir}/hicolor/*/apps/file-roller.png
 %{_omf_dest_dir}/%{name}
 %{_sysconfdir}/gconf/schemas/file-roller.schemas
 
@@ -142,6 +139,30 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74.2.1  2006/05/16 16:56:04  baggins
+- merged from HEAD
+
+Revision 1.77  2006/04/20 18:46:03  freetz
+- 2.14.2
+
+Revision 1.76  2006/04/10 21:30:56  freetz
+- 2.14.1, switched to hicolor icon theme dir
+
+Revision 1.75  2006/04/02 14:32:16  freetz
+- merged from DEVEL
+
+Revision 1.73.2.4  2006/03/13 21:21:34  freetz
+- 2.14.0
+
+Revision 1.73.2.3  2006/02/28 08:34:42  freetz
+- 2.13.92
+
+Revision 1.73.2.2  2006/02/14 07:58:40  freetz
+- 2.13.91
+
+Revision 1.73.2.1  2006/01/31 15:10:28  freetz
+- 2.13.90
+
 Revision 1.74  2006/02/08 15:35:02  freetz
 - 2.12.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/file-roller.spec?r1=1.74&r2=1.74.2.1&f=u