#1 Cleanup spec file conditionals
Merged 6 years ago by tdawson. Opened 6 years ago by merlinm.
Unknown source master  into  master

file modified
+6 -3
@@ -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 @@

  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 @@

  %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 @@

  %doc doc/html/

  

  %changelog

+ * Fri Dec 01 2017 Merlin Mathesius <mmathesi@redhat.com> - 1.4.8-2

+ - Cleanup spec file conditionals

+ 

  * Fri Sep 15 2017 Robert Scheck <robert@fedoraproject.org> 1.4.8-1

  - Upgrade to 1.4.8 (#1491483)

  

This update is identical in nature to a recent libburn update: https://src.fedoraproject.org/rpms/libburn/pull-request/1

Could you please absorb this change--with the understanding that you may, indeed, wish to revert it at some point in the future?

Pull-Request has been merged by tdawson

6 years ago
Metadata