From 2dd714dff53825170564329c79409ec8e65e35fceba5d84a1bc9bf8105d2b05d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 24 Nov 2009 22:29:50 +0000 Subject: [PATCH 1/8] Accepting request 24355 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/file-roller via accept of submit request 24355 revision 24. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/24355 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=54 --- file-roller-2.28.0.tar.bz2 | 3 --- file-roller-2.28.1.tar.bz2 | 3 +++ file-roller.changes | 6 ++++++ file-roller.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 file-roller-2.28.0.tar.bz2 create mode 100644 file-roller-2.28.1.tar.bz2 diff --git a/file-roller-2.28.0.tar.bz2 b/file-roller-2.28.0.tar.bz2 deleted file mode 100644 index d08a05d..0000000 --- a/file-roller-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:499fe835b297720f4e4054b4ab34a3fb619c3460c5da82b1519d9b86aa2f3ac2 -size 1735875 diff --git a/file-roller-2.28.1.tar.bz2 b/file-roller-2.28.1.tar.bz2 new file mode 100644 index 0000000..c895fb0 --- /dev/null +++ b/file-roller-2.28.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce1b18d0ec5e383ef64def91b67c96cebd8adfb99ac3b4bcac0ae40c90a12250 +size 1736551 diff --git a/file-roller.changes b/file-roller.changes index b0380a3..dc7bb04 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 14 02:17:26 CET 2009 - vuntz@opensuse.org + +- Update to version 2.28.1: + + Updated translations. + ------------------------------------------------------------------- Tue Sep 22 13:59:46 CEST 2009 - dimstar@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 9b38fdf..caf6a6c 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.28.0) +# spec file for package file-roller (Version 2.28.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: file-roller -Version: 2.28.0 +Version: 2.28.1 Release: 1 License: GPL v2 or later Summary: An Archive Manager for GNOME From 94081afeb4018c6dc766ab58c97ba737e07e975f5ffa5378c5d64eab01ed8327 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 4 Dec 2009 22:48:51 +0000 Subject: [PATCH 2/8] Accepting request 25552 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/file-roller via accept of submit request 25552 revision 2. Request was accepted with message: Accepting OBS-URL: https://build.opensuse.org/request/show/25552 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=55 --- file-roller-2.28.1.tar.bz2 | 3 -- file-roller-2.29.2.tar.bz2 | 3 ++ file-roller-fix-build.patch | 28 +++++++++++++++++ file-roller.changes | 26 ++++++++++++++++ file-roller.spec | 60 +++++++++++++++++++------------------ 5 files changed, 88 insertions(+), 32 deletions(-) delete mode 100644 file-roller-2.28.1.tar.bz2 create mode 100644 file-roller-2.29.2.tar.bz2 create mode 100644 file-roller-fix-build.patch diff --git a/file-roller-2.28.1.tar.bz2 b/file-roller-2.28.1.tar.bz2 deleted file mode 100644 index c895fb0..0000000 --- a/file-roller-2.28.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce1b18d0ec5e383ef64def91b67c96cebd8adfb99ac3b4bcac0ae40c90a12250 -size 1736551 diff --git a/file-roller-2.29.2.tar.bz2 b/file-roller-2.29.2.tar.bz2 new file mode 100644 index 0000000..7416cd5 --- /dev/null +++ b/file-roller-2.29.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ea24599f4ad50a8cec1ab360f15f0872cd3bc144dacf15002e77b96161036d0 +size 1768411 diff --git a/file-roller-fix-build.patch b/file-roller-fix-build.patch new file mode 100644 index 0000000..42dada3 --- /dev/null +++ b/file-roller-fix-build.patch @@ -0,0 +1,28 @@ +commit 7f9b3b55a28ae2c5c39913f6137064931406c381 +Author: Bastien Nocera +Date: Tue Dec 1 15:18:25 2009 +0000 + + Fix dbus-glib-1 check in configure + + DBUS_CFLAGS and DBUS_LIBS were never set through AC_SUBST. Clean + up the check using PKG_CHECK_MODULES instead. + + https://bugzilla.gnome.org/show_bug.cgi?id=603492 + +diff --git a/configure.ac b/configure.ac +index a7d31d9..9f48de0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -96,10 +96,9 @@ AC_ARG_ENABLE(packagekit, + [AC_HELP_STRING([--disable-packagekit],[build without PackageKit support])],, + [enable_packagekit=yes]) + if test "x$enable_packagekit" != "xno"; then +- if pkg-config dbus-glib-1; then ++ PKG_CHECK_MODULES(DBUS, dbus-glib-1, has_dbus_glib=yes, has_dbug_glib=no) ++ if test "x$has_dbus_glib" = "xyes"; then + AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit installer]) +- DBUS_CFLAGS = `pkg-config --cflags dbus-glib-1` +- DBUS_LIBS = `pkg-config --libs dbus-glib-1` + else + enable_packagekit=no + fi diff --git a/file-roller.changes b/file-roller.changes index dc7bb04..97271f6 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Dec 2 22:53:42 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.2: + + New features and user visible changes: + - Use the eggfileformatchooser widget to select the file format + + Updated translations. +- Changes from version 2.29.1: + + New features and user visible changes + - Install the missing packages if a command is not available + (bgo#482560) + + Bugs fixed: + - bgo#590606: drag and drop bug makes file-roller UI unusable + as a whole + - bgo#600131: encrypt_header is left enabled when creating zip + archives + - bgo#580624: Visual refresh issues while browsing into the + directories included in the archive + - bgo#326017: 4th and 5th mouse buttons should control back / + forward + - bgo#590027: file-roller will not update files + + Updated translations. +- Add file-roller-fix-build.patch to fix build. +- Create a nautilus-file-roller subpackage, to make file-roller + installable without nautilus. + ------------------------------------------------------------------- Sat Nov 14 02:17:26 CET 2009 - vuntz@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index caf6a6c..d48286e 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.28.1) +# spec file for package file-roller (Version 2.29.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,16 @@ Name: file-roller -Version: 2.28.1 +Version: 2.29.2 +# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory Release: 1 License: GPL v2 or later Summary: An Archive Manager for GNOME Url: http://fileroller.sourceforge.net Group: Productivity/Archiving/Compression Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM file-roller-fix-build.patch vuntz@opensuse.org -- Taken from git +Patch0: file-roller-fix-build.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: glib2-devel @@ -34,6 +37,8 @@ BuildRequires: intltool BuildRequires: nautilus-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +# Needed for patch0 file-roller-fix-build.patch +BuildRequires: gnome-common Requires: %{name}-lang = %{version} # Formats that we really want to support by default Requires: bzip2 @@ -66,40 +71,32 @@ DocDir: %{_defaultdocdir} %gconf_schemas_prereq %description -File Roller is an archive manager for GNOME. With it, you can create +File Roller is an archive manager for GNOME. With it, you can create and modify archives, view the contents of an archive, view a file -contained in the archive, and extract files from the archive. File -Roller is a front-end (a graphical interface) for archiving programs -like tar and zip. The supported file types are: +contained in the archive, and extract files from the archive. -* Tar archives uncompressed (.tar) or compressed with +%package -n nautilus-file-roller +License: GPL v2 or later +Summary: An Archive Manager for GNOME - Nautilus extension +Group: Productivity/Archiving/Compression +Requires: %{name} = %{version} +Supplements: packageand(file-roller:nautilus) -- gzip (.tar.gz, .tgz) +%description -n nautilus-file-roller +File Roller is an archive manager for GNOME. With it, you can create +and modify archives, view the contents of an archive, view a file +contained in the archive, and extract files from the archive. -- bzip (.tar.bz, .tbz) - -- bzip2 (.tar.bz2, .tbz2) - -- compress (.tar.Z, .taz) - -- lzop (.tar.lzo, .tzo) - -* Zip archives (.zip) - -* Jar archives (.jar, .ear, .war) - -* Lha archives (.lzh) - -* Rar archives (.rar) - -* Single files compressed with gzip, bzip, bzip2, compress, lzop +This package contains a plugin to integrate File Roller into Nautilus. %lang_package %prep %setup -q translation-update-upstream +%patch0 -p1 %build +NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-schemas-install\ --disable-scrollkeeper @@ -107,10 +104,12 @@ translation-update-upstream %install %makeinstall +# %if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +# %endif %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving %find_lang %{name} %find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst rm %{buildroot}%{_libdir}/*/*/*.*a %fdupes %{buildroot} @@ -133,15 +132,18 @@ if test -x usr/bin/update-mime-database ; then usr/bin/update-mime-database usr/share/mime >/dev/null fi -%files -f %{name}.lst +%files -f %{name}.schemas_list %defattr(-, root, root) %doc AUTHORS NEWS README COPYING %{_bindir}/file-roller -%{_libexecdir}/file-roller +%{_libexecdir}/file-roller/ %{_datadir}/applications/*.desktop -%{_datadir}/file-roller +%{_datadir}/file-roller/ %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg + +%files -n nautilus-file-roller +%defattr(-, root, root) %{_libdir}/nautilus/extensions-2.0/*.so %files lang -f %name.lang From b5596b3f538f440f61c835139f21e396e8ed297e31c21114778d7bdf26290b0b Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 7 Dec 2009 13:35:28 +0000 Subject: [PATCH 3/8] en@shaw OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=56 --- file-roller.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/file-roller.spec b/file-roller.spec index d48286e..985b8fa 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -19,7 +19,6 @@ Name: file-roller Version: 2.29.2 -# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory Release: 1 License: GPL v2 or later Summary: An Archive Manager for GNOME @@ -104,9 +103,9 @@ NOCONFIGURE=1 gnome-autogen.sh %install %makeinstall -# %if 0%{?suse_version} <= 1120 +%if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -# %endif +%endif %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving %find_lang %{name} %find_gconf_schemas From 7db581ca2a85aeaae975d65cbd6a2ddd89d8fc8ddc0f325696e32815857aa95e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 8 Dec 2009 09:16:24 +0000 Subject: [PATCH 4/8] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=57 --- file-roller-2.28.0.tar.bz2 | 3 ++ file-roller-2.29.2.tar.bz2 | 3 -- file-roller-fix-build.patch | 28 ------------------ file-roller.changes | 32 -------------------- file-roller.spec | 59 ++++++++++++++++++------------------- 5 files changed, 32 insertions(+), 93 deletions(-) create mode 100644 file-roller-2.28.0.tar.bz2 delete mode 100644 file-roller-2.29.2.tar.bz2 delete mode 100644 file-roller-fix-build.patch diff --git a/file-roller-2.28.0.tar.bz2 b/file-roller-2.28.0.tar.bz2 new file mode 100644 index 0000000..d08a05d --- /dev/null +++ b/file-roller-2.28.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:499fe835b297720f4e4054b4ab34a3fb619c3460c5da82b1519d9b86aa2f3ac2 +size 1735875 diff --git a/file-roller-2.29.2.tar.bz2 b/file-roller-2.29.2.tar.bz2 deleted file mode 100644 index 7416cd5..0000000 --- a/file-roller-2.29.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ea24599f4ad50a8cec1ab360f15f0872cd3bc144dacf15002e77b96161036d0 -size 1768411 diff --git a/file-roller-fix-build.patch b/file-roller-fix-build.patch deleted file mode 100644 index 42dada3..0000000 --- a/file-roller-fix-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 7f9b3b55a28ae2c5c39913f6137064931406c381 -Author: Bastien Nocera -Date: Tue Dec 1 15:18:25 2009 +0000 - - Fix dbus-glib-1 check in configure - - DBUS_CFLAGS and DBUS_LIBS were never set through AC_SUBST. Clean - up the check using PKG_CHECK_MODULES instead. - - https://bugzilla.gnome.org/show_bug.cgi?id=603492 - -diff --git a/configure.ac b/configure.ac -index a7d31d9..9f48de0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -96,10 +96,9 @@ AC_ARG_ENABLE(packagekit, - [AC_HELP_STRING([--disable-packagekit],[build without PackageKit support])],, - [enable_packagekit=yes]) - if test "x$enable_packagekit" != "xno"; then -- if pkg-config dbus-glib-1; then -+ PKG_CHECK_MODULES(DBUS, dbus-glib-1, has_dbus_glib=yes, has_dbug_glib=no) -+ if test "x$has_dbus_glib" = "xyes"; then - AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit installer]) -- DBUS_CFLAGS = `pkg-config --cflags dbus-glib-1` -- DBUS_LIBS = `pkg-config --libs dbus-glib-1` - else - enable_packagekit=no - fi diff --git a/file-roller.changes b/file-roller.changes index 97271f6..b0380a3 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,35 +1,3 @@ -------------------------------------------------------------------- -Wed Dec 2 22:53:42 CET 2009 - vuntz@opensuse.org - -- Update to version 2.29.2: - + New features and user visible changes: - - Use the eggfileformatchooser widget to select the file format - + Updated translations. -- Changes from version 2.29.1: - + New features and user visible changes - - Install the missing packages if a command is not available - (bgo#482560) - + Bugs fixed: - - bgo#590606: drag and drop bug makes file-roller UI unusable - as a whole - - bgo#600131: encrypt_header is left enabled when creating zip - archives - - bgo#580624: Visual refresh issues while browsing into the - directories included in the archive - - bgo#326017: 4th and 5th mouse buttons should control back / - forward - - bgo#590027: file-roller will not update files - + Updated translations. -- Add file-roller-fix-build.patch to fix build. -- Create a nautilus-file-roller subpackage, to make file-roller - installable without nautilus. - -------------------------------------------------------------------- -Sat Nov 14 02:17:26 CET 2009 - vuntz@opensuse.org - -- Update to version 2.28.1: - + Updated translations. - ------------------------------------------------------------------- Tue Sep 22 13:59:46 CEST 2009 - dimstar@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 985b8fa..9b38fdf 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.29.2) +# spec file for package file-roller (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,15 +18,13 @@ Name: file-roller -Version: 2.29.2 +Version: 2.28.0 Release: 1 License: GPL v2 or later Summary: An Archive Manager for GNOME Url: http://fileroller.sourceforge.net Group: Productivity/Archiving/Compression Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM file-roller-fix-build.patch vuntz@opensuse.org -- Taken from git -Patch0: file-roller-fix-build.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: glib2-devel @@ -36,8 +34,6 @@ BuildRequires: intltool BuildRequires: nautilus-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -# Needed for patch0 file-roller-fix-build.patch -BuildRequires: gnome-common Requires: %{name}-lang = %{version} # Formats that we really want to support by default Requires: bzip2 @@ -70,32 +66,40 @@ DocDir: %{_defaultdocdir} %gconf_schemas_prereq %description -File Roller is an archive manager for GNOME. With it, you can create +File Roller is an archive manager for GNOME. With it, you can create and modify archives, view the contents of an archive, view a file -contained in the archive, and extract files from the archive. +contained in the archive, and extract files from the archive. File +Roller is a front-end (a graphical interface) for archiving programs +like tar and zip. The supported file types are: -%package -n nautilus-file-roller -License: GPL v2 or later -Summary: An Archive Manager for GNOME - Nautilus extension -Group: Productivity/Archiving/Compression -Requires: %{name} = %{version} -Supplements: packageand(file-roller:nautilus) +* Tar archives uncompressed (.tar) or compressed with -%description -n nautilus-file-roller -File Roller is an archive manager for GNOME. With it, you can create -and modify archives, view the contents of an archive, view a file -contained in the archive, and extract files from the archive. +- gzip (.tar.gz, .tgz) -This package contains a plugin to integrate File Roller into Nautilus. +- bzip (.tar.bz, .tbz) + +- bzip2 (.tar.bz2, .tbz2) + +- compress (.tar.Z, .taz) + +- lzop (.tar.lzo, .tzo) + +* Zip archives (.zip) + +* Jar archives (.jar, .ear, .war) + +* Lha archives (.lzh) + +* Rar archives (.rar) + +* Single files compressed with gzip, bzip, bzip2, compress, lzop %lang_package %prep %setup -q translation-update-upstream -%patch0 -p1 %build -NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-schemas-install\ --disable-scrollkeeper @@ -103,12 +107,10 @@ NOCONFIGURE=1 gnome-autogen.sh %install %makeinstall -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving %find_lang %{name} %find_gconf_schemas +cat %{name}.schemas_list >%{name}.lst rm %{buildroot}%{_libdir}/*/*/*.*a %fdupes %{buildroot} @@ -131,18 +133,15 @@ if test -x usr/bin/update-mime-database ; then usr/bin/update-mime-database usr/share/mime >/dev/null fi -%files -f %{name}.schemas_list +%files -f %{name}.lst %defattr(-, root, root) %doc AUTHORS NEWS README COPYING %{_bindir}/file-roller -%{_libexecdir}/file-roller/ +%{_libexecdir}/file-roller %{_datadir}/applications/*.desktop -%{_datadir}/file-roller/ +%{_datadir}/file-roller %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg - -%files -n nautilus-file-roller -%defattr(-, root, root) %{_libdir}/nautilus/extensions-2.0/*.so %files lang -f %name.lang From 93b9bf4ed239edcefa2fe986af995f34c83d434662451dffc80da6d2a74c6333 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 22 Dec 2009 12:36:59 +0000 Subject: [PATCH 5/8] Accepting request 27381 from home:lmedinas:branches:GNOME:Factory Copy from home:lmedinas:branches:GNOME:Factory/file-roller via accept of submit request 27381 revision 2. Request was accepted with message: Thanks, but make sure to remove patches ;-) OBS-URL: https://build.opensuse.org/request/show/27381 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=58 --- file-roller-2.28.0.tar.bz2 | 3 -- file-roller-2.29.3.tar.bz2 | 3 ++ file-roller-fix-build.patch | 28 ++++++++++++++++++ file-roller.changes | 44 ++++++++++++++++++++++++++++ file-roller.spec | 58 ++++++++++++++++++------------------- 5 files changed, 103 insertions(+), 33 deletions(-) delete mode 100644 file-roller-2.28.0.tar.bz2 create mode 100644 file-roller-2.29.3.tar.bz2 create mode 100644 file-roller-fix-build.patch diff --git a/file-roller-2.28.0.tar.bz2 b/file-roller-2.28.0.tar.bz2 deleted file mode 100644 index d08a05d..0000000 --- a/file-roller-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:499fe835b297720f4e4054b4ab34a3fb619c3460c5da82b1519d9b86aa2f3ac2 -size 1735875 diff --git a/file-roller-2.29.3.tar.bz2 b/file-roller-2.29.3.tar.bz2 new file mode 100644 index 0000000..07f9ed9 --- /dev/null +++ b/file-roller-2.29.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb5e39874204df4a5725dd3b726d0fbd28b9b7e50c8dfc45d128bdea4eef3452 +size 1770279 diff --git a/file-roller-fix-build.patch b/file-roller-fix-build.patch new file mode 100644 index 0000000..42dada3 --- /dev/null +++ b/file-roller-fix-build.patch @@ -0,0 +1,28 @@ +commit 7f9b3b55a28ae2c5c39913f6137064931406c381 +Author: Bastien Nocera +Date: Tue Dec 1 15:18:25 2009 +0000 + + Fix dbus-glib-1 check in configure + + DBUS_CFLAGS and DBUS_LIBS were never set through AC_SUBST. Clean + up the check using PKG_CHECK_MODULES instead. + + https://bugzilla.gnome.org/show_bug.cgi?id=603492 + +diff --git a/configure.ac b/configure.ac +index a7d31d9..9f48de0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -96,10 +96,9 @@ AC_ARG_ENABLE(packagekit, + [AC_HELP_STRING([--disable-packagekit],[build without PackageKit support])],, + [enable_packagekit=yes]) + if test "x$enable_packagekit" != "xno"; then +- if pkg-config dbus-glib-1; then ++ PKG_CHECK_MODULES(DBUS, dbus-glib-1, has_dbus_glib=yes, has_dbug_glib=no) ++ if test "x$has_dbus_glib" = "xyes"; then + AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit installer]) +- DBUS_CFLAGS = `pkg-config --cflags dbus-glib-1` +- DBUS_LIBS = `pkg-config --libs dbus-glib-1` + else + enable_packagekit=no + fi diff --git a/file-roller.changes b/file-roller.changes index b0380a3..36b51a5 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Tue Dec 22 04:51:48 CET 2009 - lmedinas@opensuse.org + +- Update to version 2.29.3: + + Allow to specify different package names using a configuration + file (bgo#603757) + + Use the zip format to create cbz files + + Use AES128 as encryption type when creating zip files with 7zip + + Fixed wrong use of gdk_property_get (bgo#604535) + + Updated translations. +- drop file-roller-fix-build.patch upstreamed. + +------------------------------------------------------------------- +Wed Dec 2 22:53:42 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.2: + + New features and user visible changes: + - Use the eggfileformatchooser widget to select the file format + + Updated translations. +- Changes from version 2.29.1: + + New features and user visible changes + - Install the missing packages if a command is not available + (bgo#482560) + + Bugs fixed: + - bgo#590606: drag and drop bug makes file-roller UI unusable + as a whole + - bgo#600131: encrypt_header is left enabled when creating zip + archives + - bgo#580624: Visual refresh issues while browsing into the + directories included in the archive + - bgo#326017: 4th and 5th mouse buttons should control back / + forward + - bgo#590027: file-roller will not update files + + Updated translations. +- Add file-roller-fix-build.patch to fix build. +- Create a nautilus-file-roller subpackage, to make file-roller + installable without nautilus. + +------------------------------------------------------------------- +Sat Nov 14 02:17:26 CET 2009 - vuntz@opensuse.org + +- Update to version 2.28.1: + + Updated translations. + ------------------------------------------------------------------- Tue Sep 22 13:59:46 CEST 2009 - dimstar@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 9b38fdf..55df814 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.28.0) +# spec file for package file-roller (Version 2.29.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,9 +18,9 @@ Name: file-roller -Version: 2.28.0 +Version: 2.29.3 Release: 1 -License: GPL v2 or later +License: GPLv2+ Summary: An Archive Manager for GNOME Url: http://fileroller.sourceforge.net Group: Productivity/Archiving/Compression @@ -34,6 +34,8 @@ BuildRequires: intltool BuildRequires: nautilus-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +# Needed for patch0 file-roller-fix-build.patch +BuildRequires: gnome-common Requires: %{name}-lang = %{version} # Formats that we really want to support by default Requires: bzip2 @@ -66,33 +68,23 @@ DocDir: %{_defaultdocdir} %gconf_schemas_prereq %description -File Roller is an archive manager for GNOME. With it, you can create +File Roller is an archive manager for GNOME. With it, you can create and modify archives, view the contents of an archive, view a file -contained in the archive, and extract files from the archive. File -Roller is a front-end (a graphical interface) for archiving programs -like tar and zip. The supported file types are: +contained in the archive, and extract files from the archive. -* Tar archives uncompressed (.tar) or compressed with +%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) -- gzip (.tar.gz, .tgz) +%description -n nautilus-file-roller +File Roller is an archive manager for GNOME. With it, you can create +and modify archives, view the contents of an archive, view a file +contained in the archive, and extract files from the archive. -- bzip (.tar.bz, .tbz) - -- bzip2 (.tar.bz2, .tbz2) - -- compress (.tar.Z, .taz) - -- lzop (.tar.lzo, .tzo) - -* Zip archives (.zip) - -* Jar archives (.jar, .ear, .war) - -* Lha archives (.lzh) - -* Rar archives (.rar) - -* Single files compressed with gzip, bzip, bzip2, compress, lzop +This package contains a plugin to integrate File Roller into Nautilus. %lang_package %prep @@ -100,6 +92,7 @@ like tar and zip. The supported file types are: translation-update-upstream %build +NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-schemas-install\ --disable-scrollkeeper @@ -107,10 +100,12 @@ translation-update-upstream %install %makeinstall +%if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +%endif %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving %find_lang %{name} %find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst rm %{buildroot}%{_libdir}/*/*/*.*a %fdupes %{buildroot} @@ -133,15 +128,18 @@ if test -x usr/bin/update-mime-database ; then usr/bin/update-mime-database usr/share/mime >/dev/null fi -%files -f %{name}.lst +%files -f %{name}.schemas_list %defattr(-, root, root) %doc AUTHORS NEWS README COPYING %{_bindir}/file-roller -%{_libexecdir}/file-roller +%{_libexecdir}/file-roller/ %{_datadir}/applications/*.desktop -%{_datadir}/file-roller +%{_datadir}/file-roller/ %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg + +%files -n nautilus-file-roller +%defattr(-, root, root) %{_libdir}/nautilus/extensions-2.0/*.so %files lang -f %name.lang From ee049cd58afbf59dc8d37fdb6d5bab4d59c6831e8e5d8cfd247b3d3da60a4cdc Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 22 Dec 2009 12:38:03 +0000 Subject: [PATCH 6/8] tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=59 --- file-roller-fix-build.patch | 28 ---------------------------- file-roller.changes | 2 +- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 file-roller-fix-build.patch diff --git a/file-roller-fix-build.patch b/file-roller-fix-build.patch deleted file mode 100644 index 42dada3..0000000 --- a/file-roller-fix-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 7f9b3b55a28ae2c5c39913f6137064931406c381 -Author: Bastien Nocera -Date: Tue Dec 1 15:18:25 2009 +0000 - - Fix dbus-glib-1 check in configure - - DBUS_CFLAGS and DBUS_LIBS were never set through AC_SUBST. Clean - up the check using PKG_CHECK_MODULES instead. - - https://bugzilla.gnome.org/show_bug.cgi?id=603492 - -diff --git a/configure.ac b/configure.ac -index a7d31d9..9f48de0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -96,10 +96,9 @@ AC_ARG_ENABLE(packagekit, - [AC_HELP_STRING([--disable-packagekit],[build without PackageKit support])],, - [enable_packagekit=yes]) - if test "x$enable_packagekit" != "xno"; then -- if pkg-config dbus-glib-1; then -+ PKG_CHECK_MODULES(DBUS, dbus-glib-1, has_dbus_glib=yes, has_dbug_glib=no) -+ if test "x$has_dbus_glib" = "xyes"; then - AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit installer]) -- DBUS_CFLAGS = `pkg-config --cflags dbus-glib-1` -- DBUS_LIBS = `pkg-config --libs dbus-glib-1` - else - enable_packagekit=no - fi diff --git a/file-roller.changes b/file-roller.changes index 36b51a5..2815ce4 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -8,7 +8,7 @@ Tue Dec 22 04:51:48 CET 2009 - lmedinas@opensuse.org + Use AES128 as encryption type when creating zip files with 7zip + Fixed wrong use of gdk_property_get (bgo#604535) + Updated translations. -- drop file-roller-fix-build.patch upstreamed. +- Drop file-roller-fix-build.patch: fixed upstream. ------------------------------------------------------------------- Wed Dec 2 22:53:42 CET 2009 - vuntz@opensuse.org From 95ffd19dc7b840465d8440af6639782439d21d6deba76bfc60bbf430f275ab5f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 29 Dec 2009 23:16:43 +0000 Subject: [PATCH 7/8] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=60 --- file-roller-2.29.2.tar.bz2 | 3 +++ file-roller-2.29.3.tar.bz2 | 3 --- file-roller-fix-build.patch | 28 ++++++++++++++++++++++++++++ file-roller.changes | 12 ------------ file-roller.spec | 7 +++++-- 5 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 file-roller-2.29.2.tar.bz2 delete mode 100644 file-roller-2.29.3.tar.bz2 create mode 100644 file-roller-fix-build.patch diff --git a/file-roller-2.29.2.tar.bz2 b/file-roller-2.29.2.tar.bz2 new file mode 100644 index 0000000..7416cd5 --- /dev/null +++ b/file-roller-2.29.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ea24599f4ad50a8cec1ab360f15f0872cd3bc144dacf15002e77b96161036d0 +size 1768411 diff --git a/file-roller-2.29.3.tar.bz2 b/file-roller-2.29.3.tar.bz2 deleted file mode 100644 index 07f9ed9..0000000 --- a/file-roller-2.29.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb5e39874204df4a5725dd3b726d0fbd28b9b7e50c8dfc45d128bdea4eef3452 -size 1770279 diff --git a/file-roller-fix-build.patch b/file-roller-fix-build.patch new file mode 100644 index 0000000..42dada3 --- /dev/null +++ b/file-roller-fix-build.patch @@ -0,0 +1,28 @@ +commit 7f9b3b55a28ae2c5c39913f6137064931406c381 +Author: Bastien Nocera +Date: Tue Dec 1 15:18:25 2009 +0000 + + Fix dbus-glib-1 check in configure + + DBUS_CFLAGS and DBUS_LIBS were never set through AC_SUBST. Clean + up the check using PKG_CHECK_MODULES instead. + + https://bugzilla.gnome.org/show_bug.cgi?id=603492 + +diff --git a/configure.ac b/configure.ac +index a7d31d9..9f48de0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -96,10 +96,9 @@ AC_ARG_ENABLE(packagekit, + [AC_HELP_STRING([--disable-packagekit],[build without PackageKit support])],, + [enable_packagekit=yes]) + if test "x$enable_packagekit" != "xno"; then +- if pkg-config dbus-glib-1; then ++ PKG_CHECK_MODULES(DBUS, dbus-glib-1, has_dbus_glib=yes, has_dbug_glib=no) ++ if test "x$has_dbus_glib" = "xyes"; then + AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit installer]) +- DBUS_CFLAGS = `pkg-config --cflags dbus-glib-1` +- DBUS_LIBS = `pkg-config --libs dbus-glib-1` + else + enable_packagekit=no + fi diff --git a/file-roller.changes b/file-roller.changes index 2815ce4..97271f6 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 22 04:51:48 CET 2009 - lmedinas@opensuse.org - -- Update to version 2.29.3: - + Allow to specify different package names using a configuration - file (bgo#603757) - + Use the zip format to create cbz files - + Use AES128 as encryption type when creating zip files with 7zip - + Fixed wrong use of gdk_property_get (bgo#604535) - + Updated translations. -- Drop file-roller-fix-build.patch: fixed upstream. - ------------------------------------------------------------------- Wed Dec 2 22:53:42 CET 2009 - vuntz@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 55df814..0313207 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.29.3) +# spec file for package file-roller (Version 2.29.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,15 @@ Name: file-roller -Version: 2.29.3 +Version: 2.29.2 Release: 1 License: GPLv2+ Summary: An Archive Manager for GNOME Url: http://fileroller.sourceforge.net Group: Productivity/Archiving/Compression Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM file-roller-fix-build.patch vuntz@opensuse.org -- Taken from git +Patch0: file-roller-fix-build.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: glib2-devel @@ -90,6 +92,7 @@ This package contains a plugin to integrate File Roller into Nautilus. %prep %setup -q translation-update-upstream +%patch0 -p1 %build NOCONFIGURE=1 gnome-autogen.sh From da8420089c7dbb0c6f5ea6da9d418170e6058c339169de4bb7cd4082bdb9ddce Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 29 Dec 2009 23:16:44 +0000 Subject: [PATCH 8/8] Updating link to change in openSUSE:Factory/file-roller revision 45.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=1f69369373e88ea0641970640a1a3884 --- file-roller-2.29.2.tar.bz2 | 3 --- file-roller-2.29.3.tar.bz2 | 3 +++ file-roller-fix-build.patch | 28 ---------------------------- file-roller.changes | 12 ++++++++++++ file-roller.spec | 7 ++----- 5 files changed, 17 insertions(+), 36 deletions(-) delete mode 100644 file-roller-2.29.2.tar.bz2 create mode 100644 file-roller-2.29.3.tar.bz2 delete mode 100644 file-roller-fix-build.patch diff --git a/file-roller-2.29.2.tar.bz2 b/file-roller-2.29.2.tar.bz2 deleted file mode 100644 index 7416cd5..0000000 --- a/file-roller-2.29.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ea24599f4ad50a8cec1ab360f15f0872cd3bc144dacf15002e77b96161036d0 -size 1768411 diff --git a/file-roller-2.29.3.tar.bz2 b/file-roller-2.29.3.tar.bz2 new file mode 100644 index 0000000..07f9ed9 --- /dev/null +++ b/file-roller-2.29.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb5e39874204df4a5725dd3b726d0fbd28b9b7e50c8dfc45d128bdea4eef3452 +size 1770279 diff --git a/file-roller-fix-build.patch b/file-roller-fix-build.patch deleted file mode 100644 index 42dada3..0000000 --- a/file-roller-fix-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 7f9b3b55a28ae2c5c39913f6137064931406c381 -Author: Bastien Nocera -Date: Tue Dec 1 15:18:25 2009 +0000 - - Fix dbus-glib-1 check in configure - - DBUS_CFLAGS and DBUS_LIBS were never set through AC_SUBST. Clean - up the check using PKG_CHECK_MODULES instead. - - https://bugzilla.gnome.org/show_bug.cgi?id=603492 - -diff --git a/configure.ac b/configure.ac -index a7d31d9..9f48de0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -96,10 +96,9 @@ AC_ARG_ENABLE(packagekit, - [AC_HELP_STRING([--disable-packagekit],[build without PackageKit support])],, - [enable_packagekit=yes]) - if test "x$enable_packagekit" != "xno"; then -- if pkg-config dbus-glib-1; then -+ PKG_CHECK_MODULES(DBUS, dbus-glib-1, has_dbus_glib=yes, has_dbug_glib=no) -+ if test "x$has_dbus_glib" = "xyes"; then - AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit installer]) -- DBUS_CFLAGS = `pkg-config --cflags dbus-glib-1` -- DBUS_LIBS = `pkg-config --libs dbus-glib-1` - else - enable_packagekit=no - fi diff --git a/file-roller.changes b/file-roller.changes index 97271f6..2815ce4 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Dec 22 04:51:48 CET 2009 - lmedinas@opensuse.org + +- Update to version 2.29.3: + + Allow to specify different package names using a configuration + file (bgo#603757) + + Use the zip format to create cbz files + + Use AES128 as encryption type when creating zip files with 7zip + + Fixed wrong use of gdk_property_get (bgo#604535) + + Updated translations. +- Drop file-roller-fix-build.patch: fixed upstream. + ------------------------------------------------------------------- Wed Dec 2 22:53:42 CET 2009 - vuntz@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 0313207..55df814 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.29.2) +# spec file for package file-roller (Version 2.29.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,15 +18,13 @@ Name: file-roller -Version: 2.29.2 +Version: 2.29.3 Release: 1 License: GPLv2+ Summary: An Archive Manager for GNOME Url: http://fileroller.sourceforge.net Group: Productivity/Archiving/Compression Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM file-roller-fix-build.patch vuntz@opensuse.org -- Taken from git -Patch0: file-roller-fix-build.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: glib2-devel @@ -92,7 +90,6 @@ This package contains a plugin to integrate File Roller into Nautilus. %prep %setup -q translation-update-upstream -%patch0 -p1 %build NOCONFIGURE=1 gnome-autogen.sh