From 4af8a92a37c56d8d0ee8af466855280a5500fa0d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 03:44:36 +0000 Subject: import file-roller-3.14.2-7.el7 --- diff --git a/.file-roller.metadata b/.file-roller.metadata index 240640e..1555c2f 100644 --- a/.file-roller.metadata +++ b/.file-roller.metadata @@ -1 +1 @@ -895c4abbd5bfc0eb2385a60f53e7f6137961d657 SOURCES/file-roller-3.8.3.tar.xz +6b59302ede484df1c261e08329dcab11c45f6ef9 SOURCES/file-roller-3.14.2.tar.xz diff --git a/.gitignore b/.gitignore index 5d20df1..dca6874 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/file-roller-3.8.3.tar.xz +SOURCES/file-roller-3.14.2.tar.xz diff --git a/SOURCES/file-roller-3.14.2-fix-extraction-progress-dialog-crash.patch b/SOURCES/file-roller-3.14.2-fix-extraction-progress-dialog-crash.patch new file mode 100644 index 0000000..e92177e --- /dev/null +++ b/SOURCES/file-roller-3.14.2-fix-extraction-progress-dialog-crash.patch @@ -0,0 +1,33 @@ +From c459db8619b9eafdad9d5078838ef46afb7a9f41 Mon Sep 17 00:00:00 2001 +From: David King +Date: Thu, 16 Jul 2015 14:53:03 +0100 +Subject: [PATCH] Avoid a crash when extracting from the commandline + +If calling --extract on the the commandline, the main window is +destroyed before the progress dialog has emitted the response signal. +The callbacks for the response signal depend on the existence of the +main window, so take a reference to the main window in the progress +dialog, to ensure that it exists for the lifetime of the dialog. + +https://bugzilla.gnome.org/show_bug.cgi?id=752478 +https://bugzilla.redhat.com/show_bug.cgi?id=1186481 +--- + src/fr-window.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/fr-window.c b/src/fr-window.c +index be7a0de..8781439 100644 +--- a/src/fr-window.c ++++ b/src/fr-window.c +@@ -2478,6 +2478,8 @@ create_the_progress_dialog (FrWindow *window) + "delete_event", + G_CALLBACK (progress_dialog_delete_event), + window); ++ ++ g_object_ref (window); + } + + +-- +2.4.6 + diff --git a/SPECS/file-roller.spec b/SPECS/file-roller.spec index 95e33eb..5d8ca08 100644 --- a/SPECS/file-roller.spec +++ b/SPECS/file-roller.spec @@ -1,29 +1,44 @@ Summary: Tool for viewing and creating archives Name: file-roller -Version: 3.8.3 -Release: 3%{?dist} +Version: 3.14.2 +Release: 7%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://download.gnome.org/sources/file-roller/ #VCS: git:git://git.gnome.org/file-roller -Source: http://download.gnome.org/sources/file-roller/3.8/file-roller-%{version}.tar.xz +Source: http://download.gnome.org/sources/file-roller/3.14/file-roller-%{version}.tar.xz +# Fix a crash when the progress dialog is shown. +# https://bugzilla.redhat.com/show_bug.cgi?id=1186481 +Patch0: file-roller-3.14.2-fix-extraction-progress-dialog-crash.patch BuildRequires: glib2-devel BuildRequires: pango-devel -BuildRequires: gtk3-devel >= 2.99.3 +BuildRequires: gtk3-devel BuildRequires: nautilus-devel BuildRequires: libtool BuildRequires: gettext -BuildRequires: libSM-devel BuildRequires: desktop-file-utils BuildRequires: intltool BuildRequires: itstool -BuildRequires: GConf2-devel BuildRequires: file-devel BuildRequires: libarchive-devel BuildRequires: json-glib-devel - -Requires(pre): GConf2 +BuildRequires: libnotify-devel + +# Explicitly depend on various archivers to avoid problems when installing +# new archiver support on demand. +# https://bugzilla.redhat.com/show_bug.cgi?id=837608 +Requires: /usr/bin/ar +Requires: /usr/bin/bzip2 +Requires: /usr/bin/compress +Requires: /usr/bin/cpio +Requires: /usr/bin/gzip +Requires: /usr/bin/isoinfo +Requires: /usr/bin/lzop +Requires: /usr/bin/tar +Requires: /usr/bin/unzip +Requires: /usr/bin/xz +Requires: /usr/bin/zip %description File Roller is an application for creating and viewing archives files, @@ -33,29 +48,25 @@ such as tar or zip files. %package nautilus Summary: File Roller extension for nautilus Group: User Interface/Desktops -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{_isa} = %{version}-%{release} %description nautilus This package contains the file-roller extension for the nautilus file manger. -It adds an item to the nautilus contexst menu that lets you compress files +It adds an item to the nautilus context menu that lets you compress files or directories. %prep %setup -q +%patch0 -p1 %build -if %configure \ +%configure \ --disable-static \ --enable-nautilus-actions \ - --enable-packagekit ; \ -then - : -else - cat config.log -fi + --enable-packagekit export tagname=CC -make LIBTOOL=/usr/bin/libtool +make V=1 LIBTOOL=/usr/bin/libtool %install export tagname=CC @@ -67,15 +78,18 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache %find_lang %{name} --with-gnome -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/file-roller.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.FileRoller.desktop + +# for backward compatibility with user defined file associations +cp $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.FileRoller.desktop $RPM_BUILD_ROOT%{_datadir}/applications/file-roller.desktop +echo NoDisplay=true >> $RPM_BUILD_ROOT%{_datadir}/applications/file-roller.desktop +sed -i -e 's/X-GNOME-UsesNotifications=true/X-GNOME-UsesNotifications=false/' $RPM_BUILD_ROOT%{_datadir}/applications/file-roller.desktop +echo X-RHEL-AliasOf=org.gnome.FileRoller >> $RPM_BUILD_ROOT%{_datadir}/applications/file-roller.desktop %post update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : -%pre -%gconf_schema_obsolete file-roller - %postun update-desktop-database &> /dev/null || : if [ $1 -eq 0 ]; then @@ -92,8 +106,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %doc README COPYING NEWS AUTHORS %{_bindir}/file-roller %{_datadir}/file-roller -%{_datadir}/applications/file-roller.desktop +%{_datadir}/appdata/org.gnome.FileRoller.appdata.xml +%{_datadir}/applications/*.desktop %{_libexecdir}/file-roller +%{_datadir}/dbus-1/services/org.gnome.FileRoller.ArchiveManager1.service %{_datadir}/dbus-1/services/org.gnome.FileRoller.service %{_datadir}/icons/hicolor/*/apps/file-roller.png %{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml @@ -104,6 +120,32 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog +* Wed Sep 23 2015 Ray Strode 3.14.2-7 +- Remove duplicate X-GNOME-UsesNotifications key + Related: #1259292 + +* Wed Sep 23 2015 Ray Strode 3.14.2-6 +- Add more goo to the compat desktop file to prevent it + from getting exposed in control-center + Related: #1259292 + +* Thu Jul 23 2015 David King - 3.14.2-5 +- Simplify extraction progress dialog crash fix (#1186481) + +* Mon Jul 20 2015 David King - 3.14.2-4 +- Fix a crash in the extraction progress dialog (#1186481) + +* Fri Jun 26 2015 Ray Strode 3.14.2-3 +- add NoDisplay desktop file for 3.8 desktop id to keep backward compat + Related: #1174580 1235413 + +* Wed May 20 2015 David King - 3.14.2-2 +- Add Requires on supported archivers (#837608) + +* Mon Mar 23 2015 Richard Hughes - 3.14.2-1 +- Update to 3.14.2 +- Resolves: #1174580 + * Fri Jan 24 2014 Daniel Mach - 3.8.3-3 - Mass rebuild 2014-01-24