From 40cadf09e449363d60a66aaacd07b7c18ebf2179 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Jul 05 2016 09:23:23 +0000
Subject: Merge remote branch 'origin/master' into el5


---

diff --git a/.gitignore b/.gitignore
index cb5f623..b32bc5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-libisofs-1.?.?.tar.gz
+/libisofs-1.?.?.tar.gz
diff --git a/libisofs.spec b/libisofs.spec
index f832a23..1300056 100644
--- a/libisofs.spec
+++ b/libisofs.spec
@@ -1,14 +1,19 @@
+%global pkgname libisofs
+
 Summary:	Library to create ISO 9660 disk images
 Name:		libisofs
-Version:	1.4.2
+Version:	1.4.4
 Release:	1%{?dist}
 # make_isohybrid_mbr.c is under LGPLv2+, the rest under GPLv2+
 License:	GPLv2+ and LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://libburnia-project.org/
-Source:		http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz
+Source:		http://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz
 Patch0:		libisofs-0.6.16-multilib.patch
-BuildRequires:	libacl-devel, zlib-devel, doxygen, graphviz
+BuildRequires:	libacl-devel, zlib-devel
+%if 0%{?rhel} >= 6
+BuildRequires:	autoconf, automake, libtool
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -21,18 +26,44 @@ ACLs and xattr in ISO-9660 filesystems as well. As it is linked with
 zlib, it supports zisofs compression, too.
 
 %package devel
-Summary:	Development files for libisofs
+Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}, pkgconfig
 
 %description devel
-The libisofs-devel package contains libraries and header files for
-developing applications that use libisofs.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%package doc
+Summary:	Documentation files for %{name}
+Group:		Documentation
+%if 0%{?fedora} || 0%{?rhel} >= 6
+BuildArch:	noarch
+%endif
+BuildRequires:	doxygen, graphviz
+
+%description doc
+Libisofs is a library to create an ISO-9660 filesystem and supports
+extensions like RockRidge or Joliet. This package contains the API
+documentation for developing applications that use %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{pkgname}-%{version}
 %patch0 -p1 -b .multilib
 
+# Rename from libisofs to libisofs1 for RHEL >= 6
+%if 0%{?rhel} >= 6
+sed -e 's@libisofs_libisofs@libisofs_libisofs1@g' \
+    -e 's@libisofs/libisofs.la@libisofs/libisofs1.la@g' \
+    -e 's@(includedir)/libisofs@(includedir)/libisofs1@g' \
+    -e 's@libisofs-1.pc@libisofs1-1.pc@g' -i Makefile.am
+sed -e 's@libisofs-1.pc@libisofs1-1.pc@g' -i configure.ac
+sed -e 's@isofs@isofs1@g' libisofs-1.pc.in > libisofs1-1.pc.in
+
+libtoolize --force
+autoreconf --force
+%endif
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -64,12 +95,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/html
-%{_includedir}/%{name}
+%{_includedir}/%{name}/
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}*.pc
 
+%files doc
+%defattr(-,root,root,-)
+%doc doc/html/
+
 %changelog
+* Tue Jul 05 2016 Robert Scheck <robert@fedoraproject.org> 1.4.4-1
+- Upgrade to 1.4.4 (#1352346)
+
+* Sat Apr 30 2016 Robert Scheck <robert@fedoraproject.org> 1.4.2-3
+- Move large documentation into -doc subpackage (#744416)
+- Reworked spec file to build libisofs1 for RHEL >= 6 (#744416)
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Thu Dec 24 2015 Robert Scheck <robert@fedoraproject.org> 1.4.2-1
 - Upgrade to 1.4.2 (#1287354)
 
diff --git a/sources b/sources
index d7d645b..d1b2af1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c01099ebe557eea28fe2b0c061076129  libisofs-1.4.2.tar.gz
+23a32bb5b8559ce031420dd5fc58885c  libisofs-1.4.4.tar.gz