From 461bd3506ea866a76ffd60ed65379767af8b2298 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Oct 11 2019 17:43:33 +0000 Subject: Forgot to commit the spec --- diff --git a/xarchiver.spec b/xarchiver.spec index 9e8e57b..f88fd57 100644 --- a/xarchiver.spec +++ b/xarchiver.spec @@ -1,15 +1,11 @@ Name: xarchiver -Version: 0.5.4 -Release: 11%{?dist} +Version: 0.5.4.14 +Release: 1%{?dist} Summary: Archive manager for Xfce License: GPLv2+ -URL: http://xarchiver.xfce.org/ -Source0: http://downloads.sourceforge.net/xarchiver/xarchiver-%{version}.tar.bz2 - -Patch0: xarchiver-0.5.4-version-fix.patch -# from github.com/ib/xarchiver/commit/43896debcea363d7dfa17290e9ed8462af0375a3 -Patch1: xarchiver-0.5.4-dnd-segfault.patch +URL: https://github.com/ib/xarchiver +Source0: https://github.com/ib/xarchiver/archive/%{version}.tar.gz BuildRequires: gtk2-devel, libxml2-devel, gettext, desktop-file-utils BuildRequires: xfce4-dev-tools >= 4.3.90.2 @@ -18,7 +14,14 @@ BuildRequires: libtool BuildRequires: automake BuildRequires: intltool +# Using Debian's list of recommendations vs suggestions: +# https://salsa.debian.org/debian/xarchiver/blob/master/debian/control +%if 0%{?rhel} && 0%{?rhel} < 8 Requires: arj, binutils, bzip2, cpio, gzip, xdg-utils, tar, unzip, zip +%else +Recommends: bzip2, p7zip-plugins, unzip, xdg-utils, xz +Suggests: arj, binutils, cpio, lz4, lzop, ncompress, unar, zstd, zip +%endif %description Xarchiver is a lightweight GTK2 only frontend for manipulating 7z, arj, bzip2, @@ -28,23 +31,17 @@ archives in the arj, 7z, rar, and zip formats are supported. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -# fix spurious executable permissions of some debug files -chmod -x src/mime.* - +%autosetup %build -autoreconf -vif +./autogen.sh %configure -make %{?_smp_mflags} - +%make_build %install make install DESTDIR=%{buildroot} INSTALL="install -p" -%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) +%if 0%{?rhel} && 0%{?rhel} < 7 # On Fedora < 19 we need to install file-roller.tap as gnome-file-roller.tap, # because the name # has to match the basename of the desktop-file in # %%{_datadir}/applications. @@ -54,31 +51,35 @@ install -p -m 755 xarchiver.tap \ %endif %find_lang %{name} +%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - --add-category="Compression" \ - --add-mime-type="application/x-xz" \ - --add-mime-type="application/x-xz-compressed-tar" \ - --remove-mime-type="multipart/x-zip" \ - %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) --vendor fedora \ - %endif %{buildroot}%{_datadir}/applications/%{name}.desktop +%else +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +%endif # remove duplicate docs -rm %{buildroot}%{_docdir}/%{name}/{AUTHORS,COPYING,ChangeLog,NEWS,README,TODO} +rm %{buildroot}%{_docdir}/%{name}/{COPYING,ChangeLog,README} %files -f %{name}.lang -%doc AUTHORS COPYING ChangeLog NEWS README TODO +%doc COPYING ChangeLog README %doc %{_docdir}/%{name}/ %{_bindir}/%{name} %{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*/*/* %{_datadir}/pixmaps/%{name}/ %{_libexecdir}/thunar-archive-plugin/ +%{_mandir}/man1/%{name}.1* %changelog +* Fri Oct 11 2019 Mike DePaulo - 0.5.4.14-1 +- Update to 0.5.4.14 +- New upstream - now on GitHub +- Use weak dependencies, and refresh the list of them for archiving commands. + * Sat Jul 27 2019 Fedora Release Engineering - 0.5.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild