From 80c6faf3320946c7f4a81613cb68130009ae67fe4c7d62233ab39577e87e638b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 9 Aug 2010 23:41:33 +0000 Subject: [PATCH] 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