commit 55defee41b4b031a097896c1df055a9c515a21db Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Thu Sep 5 22:46:57 2019 +0100 Remove pointless alternatives setup for non-existent fedora unrar package unrar-nonfree.1 => unrar.1 | 0 unrar.spec | 32 +++++++------------------------- 2 files changed, 7 insertions(+), 25 deletions(-) --- diff --git a/unrar-nonfree.1 b/unrar.1 similarity index 100% rename from unrar-nonfree.1 rename to unrar.1 diff --git a/unrar.spec b/unrar.spec index 4a5cd30..2d57307 100644 --- a/unrar.spec +++ b/unrar.spec @@ -6,11 +6,9 @@ License: Freeware with further limitations URL: https://www.rarlab.com/rar_add.htm Source0: https://www.rarlab.com/rar/unrarsrc-%{version}.tar.gz # Man page from Debian -Source1: unrar-nonfree.1 +Source1: unrar.1 BuildRequires: gcc-c++ -Requires(post): chkconfig -Requires(preun): chkconfig %description @@ -55,17 +53,14 @@ cp -p %SOURCE1 . %install -install -Dpm 755 unrar %{buildroot}%{_bindir}/unrar-nonfree -install -Dpm 644 unrar-nonfree.1 %{buildroot}%{_mandir}/man1/unrar-nonfree.1 +install -Dpm 755 unrar %{buildroot}%{_bindir}/unrar +install -Dpm 644 unrar.1 %{buildroot}%{_mandir}/man1/unrar.1 install -Dpm 755 libunrar.so %{buildroot}%{_libdir}/libunrar.so -mkdir -p -m 755 %{buildroot}/%{_includedir}/unrar +mkdir -p -m 755 %{buildroot}/%{_includedir}/unrar/ for i in *.hpp; do - install -Dpm 644 $i %{buildroot}/%{_includedir}/unrar + install -Dpm 644 $i %{buildroot}/%{_includedir}/unrar/ done -# handle alternatives -touch %{buildroot}%{_bindir}/unrar - # RPM Macros support mkdir -p %{buildroot}%{_sysconfdir}/rpm cat > %{buildroot}%{_sysconfdir}/rpm/macros.unrar << EOF @@ -75,27 +70,14 @@ EOF touch -r license.txt %{buildroot}%{_sysconfdir}/rpm/macros.unrar -%post -%{_sbindir}/alternatives \ - --install %{_bindir}/unrar unrar %{_bindir}/unrar-nonfree 50 \ - --slave %{_mandir}/man1/unrar.1.gz unrar.1.gz \ - %{_mandir}/man1/unrar-nonfree.1.gz || : - -%preun -if [ "$1" -eq 0 ]; then - %{_sbindir}/alternatives \ - --remove unrar %{_bindir}/unrar-nonfree || : -fi - %ldconfig_scriptlets -n libunrar %files %doc readme.txt %license license.txt -%ghost %{_bindir}/unrar -%{_bindir}/unrar-nonfree -%{_mandir}/man1/unrar-nonfree.1* +%{_bindir}/unrar +%{_mandir}/man1/unrar.1* %files -n libunrar %doc readme.txt