Upgrade to 1.4.4 (#1352345)

This commit is contained in:
Robert Scheck 2016-07-05 22:50:28 +02:00
parent cf18344320
commit e4766f7276
2 changed files with 25 additions and 11 deletions

View File

@ -1,7 +1,7 @@
Summary: Library to enable creation and expansion of ISO-9660 filesystems Summary: Library to enable creation and expansion of ISO-9660 filesystems
Name: libisoburn Name: libisoburn
Version: 1.4.2 Version: 1.4.4
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://libburnia-project.org/ URL: http://libburnia-project.org/
@ -9,8 +9,12 @@ Source0: http://files.libburnia-project.org/releases/%{name}-%{version}.
Source1: xorriso_servicemenu.desktop Source1: xorriso_servicemenu.desktop
Patch0: libisoburn-1.0.8-multilib.patch Patch0: libisoburn-1.0.8-multilib.patch
BuildRequires: readline-devel, libacl-devel, zlib-devel, doxygen, graphviz BuildRequires: readline-devel, libacl-devel, zlib-devel, doxygen, graphviz
BuildRequires: libburn-devel >= 1.4.2, libisofs-devel >= 1.4.2 %if 0%{?rhel} >= 6
BuildRequires: libburn1-devel >= 1.4.2, libisofs1-devel >= 1.4.2
BuildRequires: autoconf, automake, libtool BuildRequires: autoconf, automake, libtool
%else
BuildRequires: libburn-devel >= 1.4.2, libisofs-devel >= 1.4.2
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description %description
@ -37,7 +41,7 @@ Summary: ISO-9660 and Rock Ridge image manipulation tool
Group: Applications/Archiving Group: Applications/Archiving
URL: http://scdbackup.sourceforge.net/xorriso_eng.html URL: http://scdbackup.sourceforge.net/xorriso_eng.html
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%if 0%{?rhel} > 5 || 0%{?fedora} %if 0%{?rhel} >= 6 || 0%{?fedora}
Requires: kde-filesystem >= 4 Requires: kde-filesystem >= 4
Requires(post): %{_sbindir}/alternatives, coreutils Requires(post): %{_sbindir}/alternatives, coreutils
Requires(preun): %{_sbindir}/alternatives Requires(preun): %{_sbindir}/alternatives
@ -62,7 +66,14 @@ DVD-RAM, BD-R and BD-RE.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .multilib %patch0 -p1 -b .multilib
# Use libisofs1 and libburn1 on RHEL >= 6
%if 0%{?rhel} >= 6
sed -e 's@\(libisofs\|libburn\)-1.pc@\11-1.pc@g' -i configure.ac
sed -e 's@\(libisofs\|libburn\)/@\11/@g' -i configure.ac */*.[hc] */*/*.cpp
sed -e 's@\(lisofs\|lburn\)@\11@g' -i Makefile.am
touch NEWS; autoreconf --force --install touch NEWS; autoreconf --force --install
%endif
%build %build
%configure --disable-static %configure --disable-static
@ -77,13 +88,13 @@ make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la
# Install the KDE service menu handler # Install the KDE service menu handler
%if 0%{?rhel} > 5 || 0%{?fedora} %if 0%{?rhel} >= 6 || 0%{?fedora}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde4/services/ServiceMenus/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/kde4/services/ServiceMenus/
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/kde4/services/ServiceMenus/ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/kde4/services/ServiceMenus/
%endif %endif
# Symlink xorriso as mkisofs (like in cdrkit) # Symlink xorriso as mkisofs (like in cdrkit)
%if 0%{?rhel} > 5 || 0%{?fedora} %if 0%{?rhel} >= 6 || 0%{?fedora}
ln -sf xorriso $RPM_BUILD_ROOT%{_bindir}/mkisofs ln -sf xorriso $RPM_BUILD_ROOT%{_bindir}/mkisofs
%endif %endif
@ -111,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
/sbin/install-info %{_infodir}/xorriso.info.gz %{_infodir}/dir || : /sbin/install-info %{_infodir}/xorriso.info.gz %{_infodir}/dir || :
/sbin/install-info %{_infodir}/xorrisofs.info.gz %{_infodir}/dir || : /sbin/install-info %{_infodir}/xorrisofs.info.gz %{_infodir}/dir || :
%if 0%{?rhel} > 5 || 0%{?fedora} %if 0%{?rhel} >= 6 || 0%{?fedora}
link=`readlink %{_bindir}/mkisofs` link=`readlink %{_bindir}/mkisofs`
if [ "$link" == "xorriso" ]; then if [ "$link" == "xorriso" ]; then
rm -f %{_bindir}/mkisofs rm -f %{_bindir}/mkisofs
@ -127,7 +138,7 @@ if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/xorriso.info.gz %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/xorriso.info.gz %{_infodir}/dir || :
/sbin/install-info --delete %{_infodir}/xorrisofs.info.gz %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/xorrisofs.info.gz %{_infodir}/dir || :
%if 0%{?rhel} > 5 || 0%{?fedora} %if 0%{?rhel} >= 6 || 0%{?fedora}
%{_sbindir}/alternatives --remove mkisofs %{_bindir}/xorriso %{_sbindir}/alternatives --remove mkisofs %{_bindir}/xorriso
%endif %endif
fi fi
@ -148,7 +159,7 @@ fi
%files -n xorriso %files -n xorriso
%defattr(-,root,root,-) %defattr(-,root,root,-)
%if 0%{?rhel} > 5 || 0%{?fedora} %if 0%{?rhel} >= 6 || 0%{?fedora}
%ghost %{_bindir}/mkisofs %ghost %{_bindir}/mkisofs
%endif %endif
%{_bindir}/osirrox %{_bindir}/osirrox
@ -161,11 +172,14 @@ fi
%{_infodir}/xorrecord.info* %{_infodir}/xorrecord.info*
%{_infodir}/xorriso.info* %{_infodir}/xorriso.info*
%{_infodir}/xorrisofs.info* %{_infodir}/xorrisofs.info*
%if 0%{?rhel} > 5 || 0%{?fedora} %if 0%{?rhel} >= 6 || 0%{?fedora}
%{_datadir}/kde4/services/ServiceMenus/xorriso_servicemenu.desktop %{_datadir}/kde4/services/ServiceMenus/xorriso_servicemenu.desktop
%endif %endif
%changelog %changelog
* Tue Jul 05 2016 Robert Scheck <robert@fedoraproject.org> 1.4.4-1
- Upgrade to 1.4.4 (#1352345)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-2 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

View File

@ -1 +1 @@
6cfed3152b3273b3717e2ef06cf9b25d libisoburn-1.4.2.tar.gz 3e1d789a0066d8deb27b672bac23e508 libisoburn-1.4.4.tar.gz