From 97c0636c33d2593b6675a5bd16bc1b71fe884690 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 2 May 2018 13:43:03 +0200 Subject: [PATCH] always install unversioned executables --- gegl04.spec | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/gegl04.spec b/gegl04.spec index a0dd7ae..57525fd 100644 --- a/gegl04.spec +++ b/gegl04.spec @@ -1,11 +1,5 @@ %global apiver 0.4 -%if ! 0%{?fedora} || 0%{?fedora} >= 29 -%bcond_without unversioned_binaries -%else -%bcond_with unversioned_binaries -%endif - Name: gegl04 Version: 0.4.0 Release: 1%{?dist} @@ -84,6 +78,7 @@ developing applications that use GEGL API version %{apiver}. Summary: Command line tools for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} License: GPLv3+ +Conflicts: gegl < 0.4 %description tools The %{name}-tools package contains tools for the command line that use the @@ -95,7 +90,7 @@ GEGL library. %build -%configure --disable-static --program-suffix=-%{apiver} +%configure --disable-static make %{?_smp_mflags} @@ -107,16 +102,6 @@ chrpath --delete %{buildroot}%{_bindir}/* chrpath --delete %{buildroot}%{_libdir}/*.so* chrpath --delete %{buildroot}%{_libdir}/gegl-%{apiver}/*.so -%if %{with unversioned_binaries} -# Install unversioned symlinks to executables -pushd %{buildroot}%{_bindir} -for versioned in *-%{apiver}; do - unversioned="${versioned%%-%{apiver}}" - ln -snf "$versioned" "$unversioned" -done -popd -%endif - # Remove .la files find %{buildroot} -name '*.la' -delete @@ -155,6 +140,7 @@ find %{buildroot} -name '*.la' -delete %changelog * Wed May 02 2018 Nils Philippsen - don't require asciidoc for building +- always install unversioned executables * Sat Apr 28 2018 Nils Philippsen - 0.4.0-1 - import into Fedora dist-git