From e1292f82fde0d51de53e2ccfe4972a36b6b6e2f1 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Dec 01 2017 16:40:25 +0000 Subject: Cleanup spec file conditionals --- diff --git a/libisofs.spec b/libisofs.spec index b51b9d4..7b6e249 100644 --- a/libisofs.spec +++ b/libisofs.spec @@ -3,7 +3,7 @@ Summary: Library to create ISO 9660 disk images Name: libisofs Version: 1.4.8 -Release: 1%{?dist} +Release: 2%{?dist} # make_isohybrid_mbr.c is under LGPLv2+, the rest under GPLv2+ License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries @@ -12,7 +12,7 @@ Source0: http://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.g Source1: http://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig Patch0: libisofs-0.6.16-multilib.patch BuildRequires: libacl-devel, zlib-devel -%if 0%{?rhel} >= 6 +%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7 BuildRequires: autoconf, automake, libtool %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,7 +53,7 @@ documentation for developing applications that use %{name}. %patch0 -p1 -b .multilib # Rename from libisofs to libisofs1 for RHEL >= 6 -%if 0%{?rhel} >= 6 +%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7 sed -e 's@libisofs_libisofs@libisofs_libisofs1@g' \ -e 's@libisofs/libisofs.la@libisofs/libisofs1.la@g' \ -e 's@(includedir)/libisofs@(includedir)/libisofs1@g' \ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html/ %changelog +* Fri Dec 01 2017 Merlin Mathesius - 1.4.8-2 +- Cleanup spec file conditionals + * Fri Sep 15 2017 Robert Scheck 1.4.8-1 - Upgrade to 1.4.8 (#1491483)