From a9699f0e065cbdb2d7f7f126a8cf9088e277e19c814a1c63e1ac52d8e3c02473 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Sep 2016 09:18:34 +0000 Subject: [PATCH] Accepting request 427881 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/427881 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=226 --- file-roller-3.21.90.tar.xz | 3 --- file-roller-3.21.91.tar.xz | 3 +++ file-roller.changes | 21 ++++++++++++++++ file-roller.spec | 51 +++++++++++++++----------------------- 4 files changed, 44 insertions(+), 34 deletions(-) delete mode 100644 file-roller-3.21.90.tar.xz create mode 100644 file-roller-3.21.91.tar.xz diff --git a/file-roller-3.21.90.tar.xz b/file-roller-3.21.90.tar.xz deleted file mode 100644 index e31aa2a..0000000 --- a/file-roller-3.21.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af117088572de573093966cfe4739ea1fa15f1c83707bbb800b64fecbef7a712 -size 1434172 diff --git a/file-roller-3.21.91.tar.xz b/file-roller-3.21.91.tar.xz new file mode 100644 index 0000000..08c9f02 --- /dev/null +++ b/file-roller-3.21.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe647a1f23c50f3ea1423a9a8de22f6d6a8cb1d60207ef790a0d554e46ee9dee +size 1433468 diff --git a/file-roller.changes b/file-roller.changes index b44c869..56a97f6 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Sep 14 20:03:36 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.91: + + New features and user visibile changes: Remove nautilus + extension. For GNOME 3.22, this functionality is now built + directly into nautilus (bgo#770248). + + Bugs fixed: bgo#766271, bgo#766227, bgo#752476. + + Updated translations. +- Drop sub-package nautilus-file-roller and obsolete it from the + main package, following upstreams removal. Also drop + pkgconfig(libnautilus-extension) BuildRequires: No longer needed. +- Conditionally apply translations-update-upstream BuildRequires + and macro for non-openSUSE only. +- Run spec-cleaner, add pkgconfig BuildRequires, and generally + fresh spec up to date. +- Switch the following Requires for Recommends: bzip2, cpio, gzip, + rpm and unzip. +- Promote p7zip to Recommends from Suggests, and also add lrzip to + Suggests as we now have it available in Tumbleweed. + ------------------------------------------------------------------- Mon Sep 5 12:28:25 UTC 2016 - zaitor@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 06c23c8..c30777b 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -17,7 +17,7 @@ Name: file-roller -Version: 3.21.90 +Version: 3.21.91 Release: 0 Summary: An Archive Manager for GNOME License: GPL-2.0+ @@ -33,71 +33,63 @@ BuildRequires: dbus-1 BuildRequires: fdupes BuildRequires: file-devel BuildRequires: intltool -BuildRequires: translation-update-upstream +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(glib-2.0) >= 2.36.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.13.2 BuildRequires: pkgconfig(json-glib-1.0) >= 0.14.0 BuildRequires: pkgconfig(libarchive) >= 3.0.0 -BuildRequires: pkgconfig(libnautilus-extension) BuildRequires: pkgconfig(libnotify) >= 0.4.3 Recommends: %{name}-lang -# Formats that we really want to support by default -Requires: bzip2 -Requires: cpio -Requires: gzip -Requires: rpm -Requires: unzip # Formats that we likely want to support by default +Recommends: bzip2 +Recommends: cpio +Recommends: gzip +Recommends: p7zip +Recommends: rpm Recommends: unrar +Recommends: unzip Recommends: xz Recommends: zip # Additional formats that are supported Suggests: lha +Suggests: lrzip Suggests: lzip Suggests: lzop -Suggests: p7zip Suggests: rzip Suggests: zoo -BuildRoot: %{_tmppath}/%{name}-%{version}-build -DocDir: %{_defaultdocdir} # FIXME: Formats for which we don't have packages. Some are free software that # we could package. #Suggests: arj -#Suggests: lrzip #Suggests: ncompress #Suggests: rar #Suggests: theunarchiver #Suggests: unace #Suggests: unalz #Suggests: unstuff +Obsoletes: nautilus-file-roller +BuildRoot: %{_tmppath}/%{name}-%{version}-build +DocDir: %{_defaultdocdir} %glib2_gsettings_schema_requires +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif %description 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. -%package -n nautilus-file-roller -Summary: An Archive Manager for GNOME - Nautilus extension -Group: Productivity/Archiving/Compression -Requires: %{name} = %{version} -Supplements: packageand(file-roller:nautilus) - -%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. - -This package contains a plugin to integrate File Roller into Nautilus. - %lang_package + %prep %setup -q %patch0 %patch1 -p1 +%if !0%{?is_opensuse} translation-update-upstream +%endif %build %configure\ @@ -108,7 +100,7 @@ make %{?_smp_mflags} %make_install %suse_update_desktop_file org.gnome.FileRoller %find_lang %{name} %{?no_lang_C} -rm %{buildroot}%{_libdir}/*/*/*.*a +find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot} %post @@ -137,10 +129,7 @@ rm %{buildroot}%{_libdir}/*/*/*.*a %{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml %{_datadir}/icons/hicolor/*/apps/* -%files -n nautilus-file-roller -%defattr(-, root, root) -%{_libdir}/nautilus/extensions-3.0/*.so - %files lang -f %{name}.lang +%defattr(-, root, root) %changelog