From 80984e419334a9ec44a34f50541057c8ec70f340 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:42:25 +0000 Subject: [PATCH] auto-import changelog data from file-roller-2.2.1-2.src.rpm Tue Feb 04 2003 Alexander Larsson 2.2.1-2 - Add patch that disables monitoring in recent-files Fri Jan 31 2003 Alexander Larsson 2.2.1-1 - Update to 2.2.1, more translations Wed Jan 22 2003 Tim Powers - rebuilt Tue Jan 21 2003 Alexander Larsson 2.2.0-1 - Update to 2.2.0 - Conflict with nautilus < 2.2.0 Thu Jan 09 2003 Alexander Larsson 2.1.5-1 - Update to 2.1.5 Thu Dec 19 2002 Havoc Pennington - 2.1.4 - remove noscripts patch, now upstream Mon Dec 09 2002 Alexander Larsson 2.1.3-3 - fix server file path Mon Dec 09 2002 Alexander Larsson 2.1.3-2 - Remove unpackaged files Mon Dec 09 2002 Alexander Larsson 2.1.3-1 - Update to 2.1.3 Fri Dec 06 2002 Havoc Pennington - 2.1.2 - fix unpackaged files --- .cvsignore | 2 +- file-roller.spec | 85 ++++++++++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 70 insertions(+), 19 deletions(-) diff --git a/.cvsignore b/.cvsignore index de80b9e..f1fc45f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -file-roller-2.0.0.tar.gz +file-roller-2.2.1.tar.bz2 diff --git a/file-roller.spec b/file-roller.spec index 61ad8d9..433b3ac 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,24 +1,26 @@ -%define glib2_version 2.0.3 -%define pango_version 1.0.99 -%define gtk2_version 2.0.5 +%define glib2_version 2.1.3 +%define pango_version 1.1.2 +%define gtk2_version 2.1.2 %define libgnomeui_version 2.0.0 %define libgnomeprint_version 1.115.0 %define libgnomeprintui_version 1.115.0 %define desktop_file_utils_version 0.2.90 -%define nautilus_version 2.0.0 +%define nautilus_version 2.2.0 Summary: File Roller is a tool for viewing and creating archives. Name: file-roller -Version: 2.0.0 -Release: 1 +Version: 2.2.1 +Release: 2 + License: GPL Group: Applications/Archiving -Source0: http://prdownloads.sourceforge.net/fileroller/file-roller-%{version}.tar.gz -URL: http://fileroller.sourceforge.net/ +Source0: file-roller-%{version}.tar.bz2 +URL: http://ftp.gnome.org/pub/gnome/sources/file-roller/ BuildRoot: %{_tmppath}/file-roller-%{version}-root PreReq: scrollkeeper >= 0.1.4 PreReq: GConf2 +PreReq: /usr/bin/gconftool-2 BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -29,15 +31,21 @@ BuildRequires: libgnomeprint-devel >= %{libgnomeprint_version} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: nautilus >= %{nautilus_version} +# The context menu API changed in 2.2.0: +Conflicts: nautilus < 2.2.0 + +Patch1: file-roller-2.2.1-recent-monitor.patch + %description File Roller is an application for creating and viewing archives files, such as tar files. %prep %setup -q +%patch1 -p1 -b .recent-monitor %build - +autoconf %configure make @@ -57,24 +65,30 @@ desktop-file-install --vendor gnome --delete-original \ --add-category X-Red-Hat-Base \ $RPM_BUILD_ROOT%{_datadir}/applications/* -#%find_lang %{name} +rm -rf $RPM_BUILD_ROOT/var/scrollkeeper +rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/libfile-roller-component.la +rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/libfile-roller-component.a + +rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.a + +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post scrollkeeper-update -#export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -#SCHEMAS="" -#for S in $SCHEMAS; do -# gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null -#done +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +SCHEMAS="file-roller.schemas" +for S in $SCHEMAS; do + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null +done %postun scrollkeeper-update -#-f %{name}.lang -%files +%files -f %{name}.lang %defattr(-, root, root) %doc README COPYING ChangeLog NEWS AUTHORS %{_bindir}/* @@ -84,8 +98,45 @@ scrollkeeper-update %{_datadir}/omf %{_datadir}/applications %{_datadir}/mime-info/* +%{_datadir}/application-registry +%{_sysconfdir}/gconf/schemas +%{_libdir}/bonobo/*.so +%{_libdir}/bonobo/servers %changelog +* Tue Feb 4 2003 Alexander Larsson 2.2.1-2 +- Add patch that disables monitoring in recent-files + +* Fri Jan 31 2003 Alexander Larsson 2.2.1-1 +- Update to 2.2.1, more translations + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 21 2003 Alexander Larsson 2.2.0-1 +- Update to 2.2.0 +- Conflict with nautilus < 2.2.0 + +* Thu Jan 9 2003 Alexander Larsson 2.1.5-1 +- Update to 2.1.5 + +* Thu Dec 19 2002 Havoc Pennington +- 2.1.4 +- remove noscripts patch, now upstream + +* Mon Dec 9 2002 Alexander Larsson 2.1.3-3 +- fix server file path + +* Mon Dec 9 2002 Alexander Larsson 2.1.3-2 +- Remove unpackaged files + +* Mon Dec 9 2002 Alexander Larsson 2.1.3-1 +- Update to 2.1.3 + +* Fri Dec 6 2002 Havoc Pennington +- 2.1.2 +- fix unpackaged files + * Wed Jul 31 2002 Havoc Pennington - fix URL field - put icon in file list diff --git a/sources b/sources index acad63c..fd14bd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36b8abec4fa283a851ce22de9ee8fc32 file-roller-2.0.0.tar.gz +0f1b4bd56f8899cf9465edebb2a18cbd file-roller-2.2.1.tar.bz2