From eb3042b5b908b448da672e7699933a529041ee2ab57e2ec4071ec411acb418b6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 13 May 2010 22:51:48 +0000 Subject: [PATCH 1/7] Accepting request 39934 from GNOME:Factory checked in (request 39934) OBS-URL: https://build.opensuse.org/request/show/39934 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=76 --- file-roller-2.30.0.tar.bz2 | 3 +++ file-roller-2.30.1.1.tar.bz2 | 3 --- file-roller-voidreturn.patch | 13 ------------- file-roller.changes | 15 --------------- file-roller.spec | 6 ++---- 5 files changed, 5 insertions(+), 35 deletions(-) create mode 100644 file-roller-2.30.0.tar.bz2 delete mode 100644 file-roller-2.30.1.1.tar.bz2 delete mode 100644 file-roller-voidreturn.patch diff --git a/file-roller-2.30.0.tar.bz2 b/file-roller-2.30.0.tar.bz2 new file mode 100644 index 0000000..a375bd2 --- /dev/null +++ b/file-roller-2.30.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fa54fb3a2616506dc2908050adbb16128b70d60dad789b20817cd4b60102fa5 +size 1805950 diff --git a/file-roller-2.30.1.1.tar.bz2 b/file-roller-2.30.1.1.tar.bz2 deleted file mode 100644 index 2eedf15..0000000 --- a/file-roller-2.30.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a8bf476fa89b52fa2e7bec4c824ebc03136bbcb55ab3694dfe6e1c1aef401b4 -size 1816845 diff --git a/file-roller-voidreturn.patch b/file-roller-voidreturn.patch deleted file mode 100644 index 3129d81..0000000 --- a/file-roller-voidreturn.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: file-roller-2.30.1.1/src/eggtreemultidnd.c -=================================================================== ---- file-roller-2.30.1.1.orig/src/eggtreemultidnd.c -+++ file-roller-2.30.1.1/src/eggtreemultidnd.c -@@ -310,7 +310,7 @@ egg_tree_multi_drag_motion_event (GtkWid - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); - gtk_tree_selection_selected_foreach (selection, selection_foreach, &path_list); - if (path_list == NULL) -- return; -+ return FALSE; - - path_list = g_list_reverse (path_list); - diff --git a/file-roller.changes b/file-roller.changes index 9a5c3fd..2a69fb4 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Wed May 5 19:24:57 CEST 2010 - meissner@suse.de - -- fixed 1 void return warning - -------------------------------------------------------------------- -Thu Apr 29 14:23:48 CEST 2010 - dimstar@opensuse.org - -- Update to version 2.30.1.1: - + bgo#613298 - Extract multi-byte filename from URI in case of - DND -- Changes from version 2.30.1: - + bgo#615127 - Fixed build error when dbus is not available - + Updated translations. - ------------------------------------------------------------------- Mon Mar 29 23:58:00 CEST 2010 - vuntz@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 6ad826c..555aa24 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.30.1.1) +# spec file for package file-roller (Version 2.30.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,14 +18,13 @@ Name: file-roller -Version: 2.30.1.1 +Version: 2.30.0 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 -Patch0: %name-voidreturn.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: glib2-devel @@ -90,7 +89,6 @@ This package contains a plugin to integrate File Roller into Nautilus. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream %build From 3d07093ea09d1dd90d58ed12a9938f26308fc4256262736f93a88a0c0f6e6b42 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 22 Jul 2010 15:46:07 +0000 Subject: [PATCH 2/7] Accepting request 43294 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/file-roller via accept of submit request 43294 revision 2. Request was accepted with message: thanks, will tweak a bit OBS-URL: https://build.opensuse.org/request/show/43294 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=77 --- file-roller-2.30.0.tar.bz2 | 3 --- file-roller-2.31.3.tar.bz2 | 3 +++ file-roller-voidreturn.patch | 13 +++++++++++++ file-roller.changes | 35 +++++++++++++++++++++++++++++++++++ file-roller.spec | 10 +++++----- 5 files changed, 56 insertions(+), 8 deletions(-) delete mode 100644 file-roller-2.30.0.tar.bz2 create mode 100644 file-roller-2.31.3.tar.bz2 create mode 100644 file-roller-voidreturn.patch diff --git a/file-roller-2.30.0.tar.bz2 b/file-roller-2.30.0.tar.bz2 deleted file mode 100644 index a375bd2..0000000 --- a/file-roller-2.30.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fa54fb3a2616506dc2908050adbb16128b70d60dad789b20817cd4b60102fa5 -size 1805950 diff --git a/file-roller-2.31.3.tar.bz2 b/file-roller-2.31.3.tar.bz2 new file mode 100644 index 0000000..186290c --- /dev/null +++ b/file-roller-2.31.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e01e6363c4ac059e9cf945668e2998824e291de8ab9a5340c4872af47b21e2fd +size 1834994 diff --git a/file-roller-voidreturn.patch b/file-roller-voidreturn.patch new file mode 100644 index 0000000..3129d81 --- /dev/null +++ b/file-roller-voidreturn.patch @@ -0,0 +1,13 @@ +Index: file-roller-2.30.1.1/src/eggtreemultidnd.c +=================================================================== +--- file-roller-2.30.1.1.orig/src/eggtreemultidnd.c ++++ file-roller-2.30.1.1/src/eggtreemultidnd.c +@@ -310,7 +310,7 @@ egg_tree_multi_drag_motion_event (GtkWid + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); + gtk_tree_selection_selected_foreach (selection, selection_foreach, &path_list); + if (path_list == NULL) +- return; ++ return FALSE; + + path_list = g_list_reverse (path_list); + diff --git a/file-roller.changes b/file-roller.changes index 2a69fb4..ec2b2a0 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Thu Jul 8 10:57:13 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.31.3: + + Fixed segmentation fault when opening some rar arches + + bgo#576436: Use dpkg-deb to view and extract .deb files +- Changes from version 2.31.2: + + bgo#620172: improved the "encrypt header" button usability. + always keep the "encrypt header" button clickable even when the + password field is void. +- changes from version 2.31.1: + + Added support for lrzip archives and lrzip compressed tar + archives. + + bgo#617769: Bring back support for archives on remote GIO + mounts when the fuse daemon is not available. + + bgo#617840: Fixed crashes when trying to create a tar.z7 + archive. due to a missing sentinel in a varargs call. + + Updated translations. +- Remove gnome-common BuildRequires and call to gnome-autogen.sh. + +------------------------------------------------------------------- +Wed May 5 19:24:57 CEST 2010 - meissner@suse.de + +- fixed 1 void return warning + +------------------------------------------------------------------- +Thu Apr 29 14:23:48 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.30.1.1: + + bgo#613298 - Extract multi-byte filename from URI in case of + DND +- Changes from version 2.30.1: + + bgo#615127 - Fixed build error when dbus is not available + + Updated translations. + ------------------------------------------------------------------- Mon Mar 29 23:58:00 CEST 2010 - vuntz@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 555aa24..1f7f278 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.30.0) +# spec file for package file-roller (Version 2.31.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,15 @@ Name: file-roller -Version: 2.30.0 +Version: 2.31.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-runner-voidreturn.patch bgo#623818 meissner@suse.de -- Fix a warning regarding void return value. +Patch0: %name-voidreturn.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: glib2-devel @@ -34,8 +36,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 @@ -89,10 +89,10 @@ This package contains a plugin to integrate File Roller into Nautilus. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build -NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-schemas-install\ --disable-scrollkeeper From 36dcc1866128b9a806bdf64df9ddddb150cfa363798c248fd39c91b6622488de Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 22 Jul 2010 21:43:14 +0000 Subject: [PATCH 3/7] Accepting request 43756 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/file-roller via accept of submit request 43756 revision 2. Request was accepted with message: auto-approving myself, to make it easier for the next batch of reviews OBS-URL: https://build.opensuse.org/request/show/43756 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=78 --- file-roller.changes | 4 ++-- file-roller.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/file-roller.changes b/file-roller.changes index ec2b2a0..52e8fb5 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -2,11 +2,11 @@ Thu Jul 8 10:57:13 CEST 2010 - dimstar@opensuse.org - Update to version 2.31.3: - + Fixed segmentation fault when opening some rar arches + + Fixed segmentation fault when opening some rar archives + bgo#576436: Use dpkg-deb to view and extract .deb files - Changes from version 2.31.2: + bgo#620172: improved the "encrypt header" button usability. - always keep the "encrypt header" button clickable even when the + Always keep the "encrypt header" button clickable even when the password field is void. - changes from version 2.31.1: + Added support for lrzip archives and lrzip compressed tar diff --git a/file-roller.spec b/file-roller.spec index 1f7f278..ee62fcd 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -58,6 +58,7 @@ DocDir: %{_defaultdocdir} # FIXME: Formats for which we don't have packages. Some are free software that # we could package. #Suggests: arj +#Suggests: lrzip #Suggests: lzip #Suggests: lzop #Suggests: ncompress From 30fca0807177677b3f5760801db0445abb900afb1c1e1aebe720eaa648fb69c0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 5 Aug 2010 21:57:55 +0000 Subject: [PATCH 4/7] Accepting request 44175 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/file-roller via accept of submit request 44175 revision 5. Request was accepted with message: thanks, we can probably remove dbus-glib-devel BuildRequires OBS-URL: https://build.opensuse.org/request/show/44175 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=79 --- file-roller-2.31.3.tar.bz2 | 3 --- file-roller-2.31.4.tar.bz2 | 3 +++ file-roller-voidreturn.patch | 13 ------------- file-roller.changes | 10 ++++++++++ file-roller.spec | 21 +++++++-------------- 5 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 file-roller-2.31.3.tar.bz2 create mode 100644 file-roller-2.31.4.tar.bz2 delete mode 100644 file-roller-voidreturn.patch diff --git a/file-roller-2.31.3.tar.bz2 b/file-roller-2.31.3.tar.bz2 deleted file mode 100644 index 186290c..0000000 --- a/file-roller-2.31.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e01e6363c4ac059e9cf945668e2998824e291de8ab9a5340c4872af47b21e2fd -size 1834994 diff --git a/file-roller-2.31.4.tar.bz2 b/file-roller-2.31.4.tar.bz2 new file mode 100644 index 0000000..367fd97 --- /dev/null +++ b/file-roller-2.31.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be0310d57804c27bb4550298648ae5da350bd9e982f1b89d2a3939cd479f2a49 +size 1832150 diff --git a/file-roller-voidreturn.patch b/file-roller-voidreturn.patch deleted file mode 100644 index 3129d81..0000000 --- a/file-roller-voidreturn.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: file-roller-2.30.1.1/src/eggtreemultidnd.c -=================================================================== ---- file-roller-2.30.1.1.orig/src/eggtreemultidnd.c -+++ file-roller-2.30.1.1/src/eggtreemultidnd.c -@@ -310,7 +310,7 @@ egg_tree_multi_drag_motion_event (GtkWid - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); - gtk_tree_selection_selected_foreach (selection, selection_foreach, &path_list); - if (path_list == NULL) -- return; -+ return FALSE; - - path_list = g_list_reverse (path_list); - diff --git a/file-roller.changes b/file-roller.changes index 52e8fb5..7447132 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jul 26 14:14:22 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.31.4: + + bgo#622900: Migrated from dbus-glib to glib's GDBus + + Ported to GSettings + + Updated translations. +- Drop file-roller-voidreturn.patch, upstream fixed. +- Replace gconf scriptlets with gsettings scriptlets. + ------------------------------------------------------------------- Thu Jul 8 10:57:13 CEST 2010 - dimstar@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index ee62fcd..522bdc6 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.31.3) +# spec file for package file-roller (Version 2.31.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,15 +18,13 @@ Name: file-roller -Version: 2.31.3 +Version: 2.31.4 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-runner-voidreturn.patch bgo#623818 meissner@suse.de -- Fix a warning regarding void return value. -Patch0: %name-voidreturn.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: glib2-devel @@ -66,7 +64,7 @@ DocDir: %{_defaultdocdir} #Suggests: unace #Suggests: unalz #Suggests: unstuff -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description File Roller is an archive manager for GNOME. With it, you can create @@ -90,7 +88,6 @@ This package contains a plugin to integrate File Roller into Nautilus. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream %build @@ -106,30 +103,25 @@ translation-update-upstream %endif %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving %find_lang %{name} -%find_gconf_schemas rm %{buildroot}%{_libdir}/*/*/*.*a %fdupes %{buildroot} %clean rm -rf %{buildroot} -%pre -f %{name}.schemas_pre - %post +%glib2_gsettings_schema_post if test -x usr/bin/update-mime-database ; then usr/bin/update-mime-database usr/share/mime >/dev/null fi -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - %postun +%glib2_gsettings_schema_postun 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 %defattr(-, root, root) %doc AUTHORS NEWS README COPYING %{_bindir}/file-roller @@ -138,6 +130,7 @@ fi %{_datadir}/file-roller/ %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg +%{_datadir}/glib-2.0/schemas/org.gnome.file-roller.gschema.xml %files -n nautilus-file-roller %defattr(-, root, root) From 36820f4e927277e7417093584a88b7bff9648e84960330bf47c1f69ec14e6509 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 5 Aug 2010 22:08:35 +0000 Subject: [PATCH 5/7] Accepting request 44626 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/file-roller via accept of submit request 44626 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44626 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=80 --- file-roller-2.31.4.tar.bz2 | 3 --- file-roller-2.31.5.tar.bz2 | 3 +++ file-roller.changes | 12 ++++++++++++ file-roller.spec | 8 +++----- 4 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 file-roller-2.31.4.tar.bz2 create mode 100644 file-roller-2.31.5.tar.bz2 diff --git a/file-roller-2.31.4.tar.bz2 b/file-roller-2.31.4.tar.bz2 deleted file mode 100644 index 367fd97..0000000 --- a/file-roller-2.31.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be0310d57804c27bb4550298648ae5da350bd9e982f1b89d2a3939cd479f2a49 -size 1832150 diff --git a/file-roller-2.31.5.tar.bz2 b/file-roller-2.31.5.tar.bz2 new file mode 100644 index 0000000..1e0e5a5 --- /dev/null +++ b/file-roller-2.31.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66e3e254c721e4ff8f91ab62360bb1b724495a9ce6244ede5efb92dcc4280554 +size 1853480 diff --git a/file-roller.changes b/file-roller.changes index 7447132..30be904 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Aug 5 23:57:12 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.31.5: + + Make it possible to build against GTK+ 3. (bgo#624564) + + Make it compile again with GSEAL and DEPRECATED macros enabled + + Updated translations. +- Drop gconf2-devel BuildRequires, since it's now ported to + GSettings. +- Remove --disable-schemas-install from configure call: it was only + needed for gconf. + ------------------------------------------------------------------- Mon Jul 26 14:14:22 CEST 2010 - dimstar@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 522bdc6..b6c3a32 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.31.4) +# spec file for package file-roller (Version 2.31.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: file-roller -Version: 2.31.4 +Version: 2.31.5 Release: 1 License: GPLv2+ Summary: An Archive Manager for GNOME @@ -26,7 +26,6 @@ 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 BuildRequires: fdupes -BuildRequires: gconf2-devel BuildRequires: glib2-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gtk2-devel @@ -92,7 +91,6 @@ translation-update-upstream %build %configure\ - --disable-schemas-install\ --disable-scrollkeeper %__make %{?jobs:-j%jobs} @@ -128,9 +126,9 @@ fi %{_libexecdir}/file-roller/ %{_datadir}/applications/*.desktop %{_datadir}/file-roller/ +%{_datadir}/glib-2.0/schemas/org.gnome.file-roller.gschema.xml %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg -%{_datadir}/glib-2.0/schemas/org.gnome.file-roller.gschema.xml %files -n nautilus-file-roller %defattr(-, root, root) From 80c6faf3320946c7f4a81613cb68130009ae67fe4c7d62233ab39577e87e638b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 9 Aug 2010 23:41:33 +0000 Subject: [PATCH 6/7] Accepting request 45049 from GNOME:Factory checked in (request 45049) OBS-URL: https://build.opensuse.org/request/show/45049 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=81 --- file-roller-2.30.1.1.tar.bz2 | 3 +++ file-roller-2.31.5.tar.bz2 | 3 --- file-roller-voidreturn.patch | 13 +++++++++++ file-roller.changes | 42 ------------------------------------ file-roller.spec | 26 +++++++++++++++------- 5 files changed, 34 insertions(+), 53 deletions(-) create mode 100644 file-roller-2.30.1.1.tar.bz2 delete mode 100644 file-roller-2.31.5.tar.bz2 create mode 100644 file-roller-voidreturn.patch diff --git a/file-roller-2.30.1.1.tar.bz2 b/file-roller-2.30.1.1.tar.bz2 new file mode 100644 index 0000000..2eedf15 --- /dev/null +++ b/file-roller-2.30.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a8bf476fa89b52fa2e7bec4c824ebc03136bbcb55ab3694dfe6e1c1aef401b4 +size 1816845 diff --git a/file-roller-2.31.5.tar.bz2 b/file-roller-2.31.5.tar.bz2 deleted file mode 100644 index 1e0e5a5..0000000 --- a/file-roller-2.31.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66e3e254c721e4ff8f91ab62360bb1b724495a9ce6244ede5efb92dcc4280554 -size 1853480 diff --git a/file-roller-voidreturn.patch b/file-roller-voidreturn.patch new file mode 100644 index 0000000..3129d81 --- /dev/null +++ b/file-roller-voidreturn.patch @@ -0,0 +1,13 @@ +Index: file-roller-2.30.1.1/src/eggtreemultidnd.c +=================================================================== +--- file-roller-2.30.1.1.orig/src/eggtreemultidnd.c ++++ file-roller-2.30.1.1/src/eggtreemultidnd.c +@@ -310,7 +310,7 @@ egg_tree_multi_drag_motion_event (GtkWid + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); + gtk_tree_selection_selected_foreach (selection, selection_foreach, &path_list); + if (path_list == NULL) +- return; ++ return FALSE; + + path_list = g_list_reverse (path_list); + diff --git a/file-roller.changes b/file-roller.changes index 30be904..9a5c3fd 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,45 +1,3 @@ -------------------------------------------------------------------- -Thu Aug 5 23:57:12 CEST 2010 - vuntz@opensuse.org - -- Update to version 2.31.5: - + Make it possible to build against GTK+ 3. (bgo#624564) - + Make it compile again with GSEAL and DEPRECATED macros enabled - + Updated translations. -- Drop gconf2-devel BuildRequires, since it's now ported to - GSettings. -- Remove --disable-schemas-install from configure call: it was only - needed for gconf. - -------------------------------------------------------------------- -Mon Jul 26 14:14:22 CEST 2010 - dimstar@opensuse.org - -- Update to version 2.31.4: - + bgo#622900: Migrated from dbus-glib to glib's GDBus - + Ported to GSettings - + Updated translations. -- Drop file-roller-voidreturn.patch, upstream fixed. -- Replace gconf scriptlets with gsettings scriptlets. - -------------------------------------------------------------------- -Thu Jul 8 10:57:13 CEST 2010 - dimstar@opensuse.org - -- Update to version 2.31.3: - + Fixed segmentation fault when opening some rar archives - + bgo#576436: Use dpkg-deb to view and extract .deb files -- Changes from version 2.31.2: - + bgo#620172: improved the "encrypt header" button usability. - Always keep the "encrypt header" button clickable even when the - password field is void. -- changes from version 2.31.1: - + Added support for lrzip archives and lrzip compressed tar - archives. - + bgo#617769: Bring back support for archives on remote GIO - mounts when the fuse daemon is not available. - + bgo#617840: Fixed crashes when trying to create a tar.z7 - archive. due to a missing sentinel in a varargs call. - + Updated translations. -- Remove gnome-common BuildRequires and call to gnome-autogen.sh. - ------------------------------------------------------------------- Wed May 5 19:24:57 CEST 2010 - meissner@suse.de diff --git a/file-roller.spec b/file-roller.spec index b6c3a32..6ad826c 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.31.5) +# spec file for package file-roller (Version 2.30.1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,14 +18,16 @@ Name: file-roller -Version: 2.31.5 +Version: 2.30.1.1 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 +Patch0: %name-voidreturn.patch BuildRequires: fdupes +BuildRequires: gconf2-devel BuildRequires: glib2-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gtk2-devel @@ -33,6 +35,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 @@ -55,7 +59,6 @@ DocDir: %{_defaultdocdir} # FIXME: Formats for which we don't have packages. Some are free software that # we could package. #Suggests: arj -#Suggests: lrzip #Suggests: lzip #Suggests: lzop #Suggests: ncompress @@ -63,7 +66,7 @@ DocDir: %{_defaultdocdir} #Suggests: unace #Suggests: unalz #Suggests: unstuff -%glib2_gsettings_schema_requires +%gconf_schemas_prereq %description File Roller is an archive manager for GNOME. With it, you can create @@ -87,10 +90,13 @@ This package contains a plugin to integrate File Roller into Nautilus. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build +NOCONFIGURE=1 gnome-autogen.sh %configure\ + --disable-schemas-install\ --disable-scrollkeeper %__make %{?jobs:-j%jobs} @@ -101,32 +107,36 @@ translation-update-upstream %endif %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving %find_lang %{name} +%find_gconf_schemas rm %{buildroot}%{_libdir}/*/*/*.*a %fdupes %{buildroot} %clean rm -rf %{buildroot} +%pre -f %{name}.schemas_pre + %post -%glib2_gsettings_schema_post if test -x usr/bin/update-mime-database ; then usr/bin/update-mime-database usr/share/mime >/dev/null fi +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun + %postun -%glib2_gsettings_schema_postun if test -x usr/bin/update-mime-database ; then usr/bin/update-mime-database usr/share/mime >/dev/null fi -%files +%files -f %{name}.schemas_list %defattr(-, root, root) %doc AUTHORS NEWS README COPYING %{_bindir}/file-roller %{_libexecdir}/file-roller/ %{_datadir}/applications/*.desktop %{_datadir}/file-roller/ -%{_datadir}/glib-2.0/schemas/org.gnome.file-roller.gschema.xml %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg From 3e936c9747e35188b991b9460504d898f0fb4b73949cc141394b120dae882c12 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 9 Aug 2010 23:41:34 +0000 Subject: [PATCH 7/7] Updating link to change in openSUSE:Factory/file-roller revision 55.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=ed3795bd430f984454bf5a5512aa0c78 --- file-roller-2.30.1.1.tar.bz2 | 3 --- file-roller-2.31.5.tar.bz2 | 3 +++ file-roller-voidreturn.patch | 13 ----------- file-roller.changes | 42 ++++++++++++++++++++++++++++++++++++ file-roller.spec | 26 +++++++--------------- 5 files changed, 53 insertions(+), 34 deletions(-) delete mode 100644 file-roller-2.30.1.1.tar.bz2 create mode 100644 file-roller-2.31.5.tar.bz2 delete mode 100644 file-roller-voidreturn.patch diff --git a/file-roller-2.30.1.1.tar.bz2 b/file-roller-2.30.1.1.tar.bz2 deleted file mode 100644 index 2eedf15..0000000 --- a/file-roller-2.30.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a8bf476fa89b52fa2e7bec4c824ebc03136bbcb55ab3694dfe6e1c1aef401b4 -size 1816845 diff --git a/file-roller-2.31.5.tar.bz2 b/file-roller-2.31.5.tar.bz2 new file mode 100644 index 0000000..1e0e5a5 --- /dev/null +++ b/file-roller-2.31.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66e3e254c721e4ff8f91ab62360bb1b724495a9ce6244ede5efb92dcc4280554 +size 1853480 diff --git a/file-roller-voidreturn.patch b/file-roller-voidreturn.patch deleted file mode 100644 index 3129d81..0000000 --- a/file-roller-voidreturn.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: file-roller-2.30.1.1/src/eggtreemultidnd.c -=================================================================== ---- file-roller-2.30.1.1.orig/src/eggtreemultidnd.c -+++ file-roller-2.30.1.1/src/eggtreemultidnd.c -@@ -310,7 +310,7 @@ egg_tree_multi_drag_motion_event (GtkWid - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); - gtk_tree_selection_selected_foreach (selection, selection_foreach, &path_list); - if (path_list == NULL) -- return; -+ return FALSE; - - path_list = g_list_reverse (path_list); - diff --git a/file-roller.changes b/file-roller.changes index 9a5c3fd..30be904 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Thu Aug 5 23:57:12 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.31.5: + + Make it possible to build against GTK+ 3. (bgo#624564) + + Make it compile again with GSEAL and DEPRECATED macros enabled + + Updated translations. +- Drop gconf2-devel BuildRequires, since it's now ported to + GSettings. +- Remove --disable-schemas-install from configure call: it was only + needed for gconf. + +------------------------------------------------------------------- +Mon Jul 26 14:14:22 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.31.4: + + bgo#622900: Migrated from dbus-glib to glib's GDBus + + Ported to GSettings + + Updated translations. +- Drop file-roller-voidreturn.patch, upstream fixed. +- Replace gconf scriptlets with gsettings scriptlets. + +------------------------------------------------------------------- +Thu Jul 8 10:57:13 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.31.3: + + Fixed segmentation fault when opening some rar archives + + bgo#576436: Use dpkg-deb to view and extract .deb files +- Changes from version 2.31.2: + + bgo#620172: improved the "encrypt header" button usability. + Always keep the "encrypt header" button clickable even when the + password field is void. +- changes from version 2.31.1: + + Added support for lrzip archives and lrzip compressed tar + archives. + + bgo#617769: Bring back support for archives on remote GIO + mounts when the fuse daemon is not available. + + bgo#617840: Fixed crashes when trying to create a tar.z7 + archive. due to a missing sentinel in a varargs call. + + Updated translations. +- Remove gnome-common BuildRequires and call to gnome-autogen.sh. + ------------------------------------------------------------------- Wed May 5 19:24:57 CEST 2010 - meissner@suse.de diff --git a/file-roller.spec b/file-roller.spec index 6ad826c..b6c3a32 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.30.1.1) +# spec file for package file-roller (Version 2.31.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,16 +18,14 @@ Name: file-roller -Version: 2.30.1.1 +Version: 2.31.5 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 -Patch0: %name-voidreturn.patch BuildRequires: fdupes -BuildRequires: gconf2-devel BuildRequires: glib2-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gtk2-devel @@ -35,8 +33,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 @@ -59,6 +55,7 @@ DocDir: %{_defaultdocdir} # FIXME: Formats for which we don't have packages. Some are free software that # we could package. #Suggests: arj +#Suggests: lrzip #Suggests: lzip #Suggests: lzop #Suggests: ncompress @@ -66,7 +63,7 @@ DocDir: %{_defaultdocdir} #Suggests: unace #Suggests: unalz #Suggests: unstuff -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description File Roller is an archive manager for GNOME. With it, you can create @@ -90,13 +87,10 @@ This package contains a plugin to integrate File Roller into Nautilus. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream %build -NOCONFIGURE=1 gnome-autogen.sh %configure\ - --disable-schemas-install\ --disable-scrollkeeper %__make %{?jobs:-j%jobs} @@ -107,36 +101,32 @@ NOCONFIGURE=1 gnome-autogen.sh %endif %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving %find_lang %{name} -%find_gconf_schemas rm %{buildroot}%{_libdir}/*/*/*.*a %fdupes %{buildroot} %clean rm -rf %{buildroot} -%pre -f %{name}.schemas_pre - %post +%glib2_gsettings_schema_post if test -x usr/bin/update-mime-database ; then usr/bin/update-mime-database usr/share/mime >/dev/null fi -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - %postun +%glib2_gsettings_schema_postun 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 %defattr(-, root, root) %doc AUTHORS NEWS README COPYING %{_bindir}/file-roller %{_libexecdir}/file-roller/ %{_datadir}/applications/*.desktop %{_datadir}/file-roller/ +%{_datadir}/glib-2.0/schemas/org.gnome.file-roller.gschema.xml %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg