rpms/libisoburn
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Added upstream patch to avoid %%check failure due to tput error

Browse Source
This commit is contained in:
Robert Scheck 2017-08-13 04:29:03 +02:00
parent 2ae44ce7d8
commit 6c8f27caa7
2 changed files with 96 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
libisoburn-1.4.6-d9c93a6d.patch Normal file
View File

@ -0,0 +1,90 @@
From d9c93a6dea182b76ecf27e2db70bfe4da944e7f5 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
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

8
libisoburn.spec
View File

@ -1,13 +1,14 @@
Summary: Library to enable creation and expansion of ISO-9660 filesystems
Name: libisoburn
Version: 1.4.6
Release: 5%{?dist}
Release: 6%{?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
Patch0: libisoburn-1.0.8-multilib.patch
Patch1: libisoburn-1.4.6-d9c93a6d.patch
BuildRequires: readline-devel, libacl-devel, zlib-devel, doxygen, graphviz
%if 0%{?rhel} >= 6
BuildRequires: libburn1-devel >= 1.4.6, libisofs1-devel >= 1.4.6
@ -66,6 +67,7 @@ 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
@ -106,7 +108,6 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/xorriso-tcltk
%check
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$RPM_BUILD_ROOT%{_libdir}"
export TERM="xterm"
cd releng
./run_all_auto -x ../xorriso/xorriso || (cat releng_generated_data/log.*; exit 1)
@ -177,6 +178,9 @@ fi
%endif
%changelog
* Sun Aug 13 2017 Robert Scheck <robert@fedoraproject.org> 1.4.6-6
- Added upstream patch to avoid %%check failure due to tput error
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild