diff --git a/.gitignore b/.gitignore index 06a8223..0625ceb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libisoburn-*.tar.gz +/libisoburn-*.tar.gz.sig diff --git a/libisoburn-1.4.6-d9c93a6d.patch b/libisoburn-1.4.6-d9c93a6d.patch deleted file mode 100644 index 34c07f8..0000000 --- a/libisoburn-1.4.6-d9c93a6d.patch +++ /dev/null @@ -1,90 +0,0 @@ -From d9c93a6dea182b76ecf27e2db70bfe4da944e7f5 Mon Sep 17 00:00:00 2001 -From: Thomas Schmitt -Date: Tue, 8 Aug 2017 09:52:39 +0200 -Subject: [PATCH] Bug fix: ./run_all_auto aborted on kojipkgs.fedoraproject.org on tput attempt. Thanks Robert Scheck. - ---- - releng/inc/releng_getopts.inc | 10 ++++++++-- - releng/run_all_auto | 24 ++++++++++++++++++++---- - 2 files changed, 28 insertions(+), 6 deletions(-) - -diff --git a/releng/inc/releng_getopts.inc b/releng/inc/releng_getopts.inc -index ecae07d..3d1db4b 100644 ---- a/releng/inc/releng_getopts.inc -+++ b/releng/inc/releng_getopts.inc -@@ -43,12 +43,18 @@ EOF - - ############################################# - boldify() { -- if which tput >/dev/null 2>&1; then tput smso; fi -+ if which tput >/dev/null 2>&1 -+ then -+ tput smso || dummy_variable=1 -+ fi - } - - ############################################# - unboldify() { -- if which tput >/dev/null 2>&1; then tput rmso; fi -+ if which tput >/dev/null 2>&1 -+ then -+ tput rmso || dummy_variable=1 -+ fi - } - - ############################################# -diff --git a/releng/run_all_auto b/releng/run_all_auto -index 1ba8f77..15c8218 100755 ---- a/releng/run_all_auto -+++ b/releng/run_all_auto -@@ -59,6 +59,22 @@ count_lines() - } - - ############################################# -+# copied from releng/inc/releng_getopts.inc which is not included here. -+boldify() { -+ if which tput >/dev/null 2>&1 -+ then -+ tput smso || dummy_variable=1 -+ fi -+} -+ -+unboldify() { -+ if which tput >/dev/null 2>&1 -+ then -+ tput rmso || dummy_variable=1 -+ fi -+} -+ -+############################################# - print_usage() - { - cat << HLP -@@ -162,9 +178,9 @@ fi - *) - exit_value=2 - printf "done in ${TS} sec. " -- which tput >/dev/null 2>&1 && tput smso -+ boldify - printf "FAIL -> EXIT CODE $RET" -- which tput >/dev/null 2>&1 && tput rmso -+ unboldify - echo - ;; - esac -@@ -236,10 +252,10 @@ fi - fi - - # -- which tput >/dev/null 2>&1 && tput smso -+ boldify - echo # | tee -a ${CLOG} - echo "${SELF}: Leaving the following cruft in ${GEN_DATA_DIR}:" # | tee -a ${CLOG} -- which tput >/dev/null 2>&1 && tput rmso -+ unboldify - ls -lth "${GEN_DATA_DIR}" # | tee -a ${CLOG} - - # Fin --- -libgit2 0.25.0 - diff --git a/libisoburn.spec b/libisoburn.spec index 5bad33a..8d57065 100644 --- a/libisoburn.spec +++ b/libisoburn.spec @@ -1,20 +1,20 @@ Summary: Library to enable creation and expansion of ISO-9660 filesystems Name: libisoburn -Version: 1.4.6 -Release: 7%{?dist} +Version: 1.4.8 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://libburnia-project.org/ Source0: http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz -Source1: xorriso_servicemenu.desktop +Source1: http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz.sig +Source2: xorriso_servicemenu.desktop Patch0: libisoburn-1.0.8-multilib.patch -Patch1: libisoburn-1.4.6-d9c93a6d.patch BuildRequires: readline-devel, libacl-devel, zlib-devel %if 0%{?rhel} >= 6 -BuildRequires: libburn1-devel >= 1.4.6, libisofs1-devel >= 1.4.6 +BuildRequires: libburn1-devel >= %{version}, libisofs1-devel >= %{version} BuildRequires: autoconf, automake, libtool %else -BuildRequires: libburn-devel >= 1.4.6, libisofs-devel >= 1.4.6 +BuildRequires: libburn-devel >= %{version}, libisofs-devel >= %{version} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,7 +81,6 @@ DVD-RAM, BD-R and BD-RE. %prep %setup -q %patch0 -p1 -b .multilib -%patch1 -p1 -b .d9c93a6d # Use libisofs1 and libburn1 on RHEL >= 6 %if 0%{?rhel} >= 6 @@ -109,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT%{_defaultdocdir} # Install the KDE service menu handler %if 0%{?rhel} >= 6 || 0%{?fedora} 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 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/kde4/services/ServiceMenus/ %endif # Symlink xorriso as mkisofs (like in cdrkit) @@ -195,6 +194,9 @@ fi %endif %changelog +* Fri Sep 15 2017 Robert Scheck 1.4.8-1 +- Upgrade to 1.4.8 (#1491482) + * Thu Aug 24 2017 Robert Scheck 1.4.6-7 - Move large documentation into -doc subpackage diff --git a/sources b/sources index 038a712..c692102 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -15d763fd698b9bc8d6fc643a3257505b libisoburn-1.4.6.tar.gz +SHA512 (libisoburn-1.4.8.tar.gz) = 26dd6f6884d98d9d3f54bf18b529a688d28aa0ff54b7fe6fe7926c7765755a1c7f7b2d0ef02ca6ea2bdac9ddf6f928c01c89a3547aea1e9f0b47346b160d0d46 +SHA512 (libisoburn-1.4.8.tar.gz.sig) = 115f2aab04b10bfe25d776c4599b8a08e39aa2ffcb72efac5a4c0c80dc7d530a8fd970b4ce68854a968bd89d48f634db4e429739f4632c5fd599ea9a707c0603