pool/file-roller
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 133156 from GNOME:Next

Browse Source 
Push G:N - Resubmit after adjusting based on the comments

OBS-URL: https://build.opensuse.org/request/show/133156
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=142
This commit is contained in:
Vincent Untz 2012-09-07 15:23:39 +00:00 committed by Git OBS Bridge
parent 8a73d68fe7
commit 1ec22bc92e
6 changed files with 184 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
file-roller-3.4-change-archiver-priority.patch
View File

@ -2,19 +2,19 @@ Index: src/fr-init.c
=================================================================== ===================================================================
--- src/fr-init.c.orig --- src/fr-init.c.orig
+++ src/fr-init.c +++ src/fr-init.c
@@ -339,6 +339,7 @@ register_commands (void) @@ -350,6 +350,7 @@ register_archives (void)
register_command (FR_TYPE_COMMAND_TAR); register_archive (FR_TYPE_COMMAND_TAR);
register_command (FR_TYPE_COMMAND_CFILE); register_archive (FR_TYPE_COMMAND_CFILE);
+ register_command (FR_TYPE_COMMAND_ZIP); + register_archive (FR_TYPE_COMMAND_ZIP);
register_command (FR_TYPE_COMMAND_7Z); register_archive (FR_TYPE_COMMAND_7Z);
register_command (FR_TYPE_COMMAND_DPKG); register_archive (FR_TYPE_COMMAND_DPKG);
@@ -353,7 +354,6 @@ register_commands (void) @@ -364,7 +365,6 @@ register_archives (void)
register_command (FR_TYPE_COMMAND_RAR); register_archive (FR_TYPE_COMMAND_RAR);
register_command (FR_TYPE_COMMAND_RPM); register_archive (FR_TYPE_COMMAND_RPM);
register_command (FR_TYPE_COMMAND_UNSTUFF); register_archive (FR_TYPE_COMMAND_UNSTUFF);
- register_command (FR_TYPE_COMMAND_ZIP); - register_archive (FR_TYPE_COMMAND_ZIP);
register_command (FR_TYPE_COMMAND_LRZIP); register_archive (FR_TYPE_COMMAND_LRZIP);
register_command (FR_TYPE_COMMAND_ZOO); register_archive (FR_TYPE_COMMAND_ZOO);
} #if HAVE_JSON_GLIB

3
file-roller-3.4.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7085a351c55171718bbf5b9b614a7b9606efb8cbd2eb44cc6c538545444d0cdd
size 1548788

3
file-roller-3.5.91.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b35f0dc128ca5d1085494385923c5c529deb3d7f73e05ba02be6f672bcd99a4
size 1472880

23
file-roller-pkg-match.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/data/packages.match b/data/packages.match
index 78b9fe3..25775c0 100644
--- a/data/packages.match
+++ b/data/packages.match
@@ -6,15 +6,15 @@ cpio=
dpkg=
genisoimage=
gzip=
-lha=
+lha=lhasa
lrzip=
lzip=
lzma=
lzop=
ncompress=
p7zip=
-p7zip-full=
-p7zip-rar=
+p7zip-full=p7zip
+p7zip-rar=p7zip
rar=
rpm=
rzip=

124
file-roller.changes
View File

@ -1,3 +1,127 @@
-------------------------------------------------------------------
Mon Sep 3 19:41:18 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.91:
+ Nautilus extension "Compress" doesn't offer .gz anymore
(bgo#682807)
+ Fixed build without libarchive support (bgo#682774)
+ libarchive: restore the file attributes when extracting
(bgo#682513)
+ Updated translations.
-------------------------------------------------------------------
Sun Sep 2 19:18:12 UTC 2012 - dimstar@opensuse.org
- Add file-roller-pkg-match.patch: Update the package match list
for PackageKit to be able to install the right packages when
needed (bnc#696530).
-------------------------------------------------------------------
Mon Aug 20 20:30:12 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.90:
+ New features and user visible changes:
- Use a single 'Add files' dialog that allows to add both files
and folder instead of having two separated commands
'Add files' and 'Add folder'.
- Make the "New Archive" dialog look like the "Compress" dialog
(bgo#681232)
- Extract dialog: always ask whether to overwrite existing
files (removed the overwrite option)
- Properties dialog: allow to open the archive's folder.
- 'Add files' dialog: added option to follow symbolic links.
- Edit->Password applies the password to already existing files
in the archive (bgo#144391)
- Password dialog: show an error message when the password is
wrong.
- File list sorting: always keep the directories first, even
when sorting in reverse order.
+ Bugs fixed:
- Removed non existant keys from the .convert file (bgo#682022)
- Fixed crash when opening compressed files. (bgo#681766)
- Fixed crash when extracting an archive from the nautilus
context menu. (bgo#681473)
- Fixed crash when extracting from the Extract dialog.
+ Updated translations
-------------------------------------------------------------------
Mon Aug 6 20:18:41 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.4:
+ New features and user visible changes:
- Optionally use libarchive to handle tar, cpio, lha archives
and ISO images.
- Notify the completion of a long operation with the system
notification system (requires libnotify).
- Removed the Stop action from the View menu.
- Removed the Help buttons from the dialogs.
- Updated the user help.
+ Bugs fixed:
- Can't open file inside a .rar archive (with unar)
(bgo#680676)
- Change "Re-create folders" to "Keep directory structure"
(bgo#681235)
+ Internal code changes:
- Huge internal code refactoring to allow the use of
libarchive. This can bring some regressions.
+ Updated translations.
- Add pkgconfig(libarchive) and pkgconfig(libnotify) BuildRequires,
allowing the new features to be built.
- Rebase file-roller-3.4-change-archiver-priority.patch.
- Pass --disable-magic to configure: we don't have libmagic
packaged yet.
-------------------------------------------------------------------
Tue Jul 17 11:40:20 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.3:
+ Allow to extract rar archives with 'The Unarchiver'. requires
json-glib (bgo#646606)
+ "Folder Content could not be displayed" error when using
--extract. (bgo#678884)
+ Updated translations.
- Add pkgconfig(json-glib-1.0) BuildRequires: new dependency.
- Rebase file-roller-3.4-change-archiver-priority.patch.
-------------------------------------------------------------------
Mon Jun 25 21:08:00 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.2:
+ New features and user visible changes:
- Allow the user to cancel addition and deletion of files to an
exiting archive.
- Progress dialog: show the number of remaining files to
complete the operation; show the archive name in the main
message.
- Removed the stop button from the toolbar. The user can use
the progress dialog cancel button to stop a long operation.
- Enabled interactive search in the file list. The user can
just start typing the name of a file and if present in the
list it will get selected.
- Removed the help buttons from the dialogs.
+ Internal code changes:
- Renamed the D-Bus interface as org.gnome.ArchiveManager1.
- Use the file-roller extecutable as a D-Bus service as well,
instead of using a separate executable.
- Define the progress dialog and other dialogs in external files,
saved as gresources.
- Added a prefix to the utility functions for a better
organization and readability of the code.
+ Updated translations.
-------------------------------------------------------------------
Mon Jun 18 10:10:17 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.1:
+ Use GtkApplication
+ Added an application menu
+ Use GResource to store ui files
+ Removed markup in translatable messages
+ Ported to the new documentation infrastructure
+ Updated translations.
- Replace gnome-doc-utils-devel BuildRequires with yelp-tools
following upstreams change of documentation infrastructure.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 17 17:29:05 UTC 2012 - gankov@opensuse.org Sun Jun 17 17:29:05 UTC 2012 - gankov@opensuse.org

35
file-roller.spec
View File

@ -17,27 +17,33 @@
Name: file-roller Name: file-roller
Version: 3.4.2 Version: 3.5.91
Release: 0 Release: 0
# FIXME: Enable libmagic support.
Summary: An Archive Manager for GNOME Summary: An Archive Manager for GNOME
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Archiving/Compression Group: Productivity/Archiving/Compression
Url: http://fileroller.sourceforge.net Url: http://fileroller.sourceforge.net
Source: http://download.gnome.org/sources/file-roller/3.4/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/file-roller/3.5/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE file-roller-3.4-change-archiver-priority.patch bnc#767386 gankov@opensuse.org -- Give unzip a higher priority than 7z when unpackging zip files. Gives better results for non-latin charsets. # PATCH-FIX-OPENSUSE file-roller-3.4-change-archiver-priority.patch bnc#767386 gankov@opensuse.org -- Give unzip a higher priority than 7z when unpackging zip files. Gives better results for non-latin charsets.
Patch0: file-roller-3.4-change-archiver-priority.patch Patch0: file-roller-3.4-change-archiver-priority.patch
# PATCH-FEATURE-OPENSUSE file-roller-pkg-match.patch bnc#696530 dimstar@opensuse.org -- List package match names for automatic installation using PK.
Patch1: file-roller-pkg-match.patch
# Needed for directory ownership # Needed for directory ownership
BuildRequires: dbus-1 BuildRequires: dbus-1
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gnome-doc-utils-devel
BuildRequires: intltool BuildRequires: intltool
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: yelp-tools
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0
BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(json-glib-1.0) >= 0.14.0
BuildRequires: pkgconfig(libarchive) >= 3.0.0
BuildRequires: pkgconfig(libnautilus-extension) BuildRequires: pkgconfig(libnautilus-extension)
BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(libnotify) >= 0.4.3
BuildRequires: pkgconfig(sm) >= 1.0.0
Recommends: %{name}-lang Recommends: %{name}-lang
# Formats that we really want to support by default # Formats that we really want to support by default
Requires: bzip2 Requires: bzip2
@ -65,6 +71,7 @@ DocDir: %{_defaultdocdir}
#Suggests: lzop #Suggests: lzop
#Suggests: ncompress #Suggests: ncompress
#Suggests: rar #Suggests: rar
#Suggests: theunarchiver
#Suggests: unace #Suggests: unace
#Suggests: unalz #Suggests: unalz
#Suggests: unstuff #Suggests: unstuff
@ -92,19 +99,21 @@ This package contains a plugin to integrate File Roller into Nautilus.
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch1 -p1
translation-update-upstream translation-update-upstream
%build %build
%configure\ %configure\
--disable-scrollkeeper --disable-scrollkeeper \
--disable-magic
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
%install %install
%makeinstall %make_install
%if 0%{?suse_version} <= 1120 %if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif %endif
%suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %{name} Archiving
%find_lang %{name} %{?no_lang_C} %find_lang %{name} %{?no_lang_C}
rm %{buildroot}%{_libdir}/*/*/*.*a rm %{buildroot}%{_libdir}/*/*/*.*a
%fdupes %{buildroot} %fdupes %{buildroot}
@ -122,17 +131,13 @@ rm %{buildroot}%{_libdir}/*/*/*.*a
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS NEWS README COPYING %doc AUTHORS NEWS README COPYING
%dir %{_datadir}/gnome/
%dir %{_datadir}/gnome/help/
%dir %{_datadir}/gnome/help/%{name}/
%doc %{_datadir}/gnome/help/%{name}/C/
%{_bindir}/file-roller %{_bindir}/file-roller
%{_libexecdir}/file-roller/ %{_libexecdir}/file-roller/
%{_libexecdir}/file-roller-server
%{_datadir}/GConf/gsettings/file-roller.convert %{_datadir}/GConf/gsettings/file-roller.convert
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/dbus-1/services/org.gnome.FileRoller.service %{_datadir}/dbus-1/services/org.gnome.FileRoller.service
%{_datadir}/file-roller/ %{_datadir}/file-roller/
%doc %{_datadir}/help/C/%{name}/
%{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml
%{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.png
@ -140,6 +145,6 @@ rm %{buildroot}%{_libdir}/*/*/*.*a
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/nautilus/extensions-3.0/*.so %{_libdir}/nautilus/extensions-3.0/*.so
%files lang -f %name.lang %files lang -f %{name}.lang
%changelog %changelog