Dropped man-fix patch (upstreamed)

- Hardened build
  Related: rhbz#1092547
This commit is contained in:
Jaroslav Škarvada 2016-04-05 14:31:29 +02:00
parent 64d27ff605
commit ab3a2f6816
2 changed files with 11 additions and 18 deletions

View File

@ -1,13 +0,0 @@
diff --git a/Documents/brltty.1.in b/Documents/brltty.1.in
index 7ed1db0..6dc0851 100644
--- a/Documents/brltty.1.in
+++ b/Documents/brltty.1.in
@@ -16,7 +16,7 @@
.\"
.\" This software is maintained by Dave Mielke <dave@mielke.cc>.
.\"
-3TH "BRLTTY" "1" "2014-11-06" "brltty 5.2" "BRLTTY User's Manual"
+.TH "BRLTTY" "1" "2014-11-06" "brltty 5.2" "BRLTTY User's Manual"
.SH NAME
brltty \- refreshable braille display driver for Linux/Unix
.SH SYNOPSIS

View File

@ -7,6 +7,9 @@
%global with_python3 0
%endif
# hardened build if not overridden
%{!?_hardened_build:%global _hardened_build 1}
%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %global tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}}
@ -22,7 +25,7 @@
Name: brltty
Version: %{pkg_version}
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+
Group: System Environment/Daemons
URL: http://mielke.cc/brltty/
@ -31,7 +34,6 @@ Source1: brltty.service
Patch4: brltty-loadLibrary.patch
# libspeechd.h moved in latest speech-dispatch (NOT sent upstream)
Patch5: brltty-5.0-libspeechd.patch
#Patch6: brltty-5.2-man-fix.patch
Summary: Braille display driver for Linux/Unix
BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd
BuildRequires: gettext, at-spi2-core-devel, espeak-devel
@ -196,7 +198,6 @@ This package provides the OCaml binding for BrlAPI.
%setup -q
%patch4 -p1 -b .loadLibrary
%patch5 -p1
#%patch6 -p1 -b .man-fix
%if 0%{?with_python3}
# Make a copy of the source tree for building the Python 3 module
@ -233,14 +234,14 @@ configure_opts=" \
# First build everything with Python 2 support
%configure $configure_opts PYTHON=%{__python2}
# Parallel build seems broken, thus disabling it
make
make LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-fpic -Wl,-z,relro,-z,now}"
%if 0%{?with_python3}
# ... and then do it again for the Python 3 module
pushd %{py3dir}
%configure $configure_opts PYTHON=%{__python3}
# Parallel build seems broken, thus disabling it
make
make LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-fpic -Wl,-z,relro,-z,now}"
popd
%endif
@ -411,6 +412,11 @@ fi
%endif
%changelog
* Tue Apr 5 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 5.3.1-4
- Dropped man-fix patch (upstreamed)
- Hardened build
Related: rhbz#1092547
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild