- Upgrade to 1.4.2 (#1287353)

- Add symlink handling via alternatives for mkisofs (#1256240)
This commit is contained in:
Robert Scheck 2015-12-25 02:10:30 +01:00
parent 1968ca0fff
commit e0c0409ff6
2 changed files with 38 additions and 8 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.0 Version: 1.4.2
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,7 +9,7 @@ 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.0, libisofs-devel >= 1.4.0 BuildRequires: libburn-devel >= 1.4.2, libisofs-devel >= 1.4.2
BuildRequires: autoconf, automake, libtool BuildRequires: autoconf, automake, libtool
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -37,8 +37,10 @@ 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}%{?fedora} > 5 %if 0%{?rhel} > 5 || 0%{?fedora}
Requires: kde-filesystem >= 4 Requires: kde-filesystem >= 4
Requires(post): %{_sbindir}/alternatives, coreutils
Requires(preun): %{_sbindir}/alternatives
%endif %endif
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
@ -75,11 +77,16 @@ 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}%{?fedora} > 5 %if 0%{?rhel} > 5 || 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)
%if 0%{?rhel} > 5 || 0%{?fedora}
ln -sf xorriso $RPM_BUILD_ROOT%{_bindir}/mkisofs
%endif
# Some file cleanups # Some file cleanups
rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@ -104,16 +111,32 @@ 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}
link=`readlink %{_bindir}/mkisofs`
if [ "$link" == "xorriso" ]; then
rm -f %{_bindir}/mkisofs
fi
%{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs %{_bindir}/xorriso 50 \
--slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman %{_mandir}/man1/xorrisofs.1.gz
%endif
%preun -n xorriso %preun -n xorriso
if [ $1 = 0 ]; then if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/xorrecord.info.gz %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/xorrecord.info.gz %{_infodir}/dir || :
/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}
%{_sbindir}/alternatives --remove mkisofs %{_bindir}/xorriso
%endif
fi fi
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING COPYRIGHT README ChangeLog %{!?_licensedir:%global license %%doc}
%license COPYING
%doc AUTHORS COPYRIGHT README ChangeLog
%{_libdir}/%{name}*.so.* %{_libdir}/%{name}*.so.*
%files devel %files devel
@ -125,6 +148,9 @@ fi
%files -n xorriso %files -n xorriso
%defattr(-,root,root,-) %defattr(-,root,root,-)
%if 0%{?rhel} > 5 || 0%{?fedora}
%ghost %{_bindir}/mkisofs
%endif
%{_bindir}/osirrox %{_bindir}/osirrox
%{_bindir}/xorrecord %{_bindir}/xorrecord
%{_bindir}/xorriso %{_bindir}/xorriso
@ -135,11 +161,15 @@ fi
%{_infodir}/xorrecord.info* %{_infodir}/xorrecord.info*
%{_infodir}/xorriso.info* %{_infodir}/xorriso.info*
%{_infodir}/xorrisofs.info* %{_infodir}/xorrisofs.info*
%if 0%{?rhel}%{?fedora} > 5 %if 0%{?rhel} > 5 || 0%{?fedora}
%{_datadir}/kde4/services/ServiceMenus/xorriso_servicemenu.desktop %{_datadir}/kde4/services/ServiceMenus/xorriso_servicemenu.desktop
%endif %endif
%changelog %changelog
* Thu Dec 24 2015 Robert Scheck <robert@fedoraproject.org> 1.4.2-1
- Upgrade to 1.4.2 (#1287353)
- Add symlink handling via alternatives for mkisofs (#1256240)
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-2 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

View File

@ -1 +1 @@
77bc6bcbe023ccd0fb210e341606dfbf libisoburn-1.4.0.tar.gz 6cfed3152b3273b3717e2ef06cf9b25d libisoburn-1.4.2.tar.gz