Make docdirs unversioned on Fedora 20+ (#986871)

- Hack around libtool issue for hardened build for now (#978949)
This commit is contained in:
Kevin Fenzi 2013-07-24 16:20:05 -06:00
parent 3610794c3e
commit e6fe460e84
3 changed files with 57 additions and 1 deletions

View File

@ -0,0 +1,25 @@
--- redhat-rpm-config-9.1.0.orig/macros
+++ redhat-rpm-config-9.1.0/macros
@@ -28,7 +28,7 @@
# ---- configure and makeinstall.
#
%_configure ./configure
-%configure \
+%configure(--:-:ChnqV) \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
@@ -52,7 +52,12 @@
--localstatedir=%{_localstatedir} \\\
--sharedstatedir=%{_sharedstatedir} \\\
--mandir=%{_mandir} \\\
- --infodir=%{_infodir}
+ --infodir=%{_infodir} \\\
+ %{**} ; \
+ [[ -f ./libtool && "x%{?%_hardened_ldflags}" != "x" ]] && \\\
+ sed -i \\\
+ -e 's! \\\\\\$compiler_flags !&%{?%_hardened_ldflags} !g' \\\
+ ./libtool ;
%makeinstall \
%{__make} \\\

View File

@ -0,0 +1,12 @@
diff -Nur redhat-rpm-config-9.1.0.orig/macros redhat-rpm-config-9.1.0/macros
--- redhat-rpm-config-9.1.0.orig/macros 2013-07-24 14:45:29.972653928 -0600
+++ redhat-rpm-config-9.1.0/macros 2013-07-24 14:46:14.419922188 -0600
@@ -18,6 +18,8 @@
%_mandir %{_prefix}/share/man
%_defaultdocdir %{_prefix}/share/doc
+%_pkgdocdir %{_docdir}/%{name}
+%_docdir_fmt %%{NAME}
%_fmoddir %{_libdir}/gfortran/modules

View File

@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 9.1.0 Version: 9.1.0
Release: 49%{?dist} Release: 50%{?dist}
# No version specified. # No version specified.
License: GPL+ License: GPL+
Group: Development/System Group: Development/System
@ -60,6 +60,16 @@ Patch22: redhat-rpm-config-9.1.0-ncpus-max.patch
Patch23: redhat-rpm-config-9.1.0-stackprotector-strong.patch Patch23: redhat-rpm-config-9.1.0-stackprotector-strong.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=905573 # https://bugzilla.redhat.com/show_bug.cgi?id=905573
Patch24: redhat-rpm-config-9.1.0-jar-repack-perms.patch Patch24: redhat-rpm-config-9.1.0-jar-repack-perms.patch
# Hacky fix for hardened build and libtool.
# Should be dropped as soon as libtool is fixed.
# https://bugzilla.redhat.com/show_bug.cgi?id=978949
Patch25: redhat-rpm-config-9.1.0-libtool-hardened-build.patch
%if 0%{?fedora} >= 20
# Drop versioning on docdirs in Fedora 20+
# https://bugzilla.redhat.com/show_bug.cgi?id=986871
Patch26: redhat-rpm-config-9.1.0-unversioned-docdirs.patch
%endif
BuildArch: noarch BuildArch: noarch
Requires: coreutils Requires: coreutils
Requires: perl-srpm-macros Requires: perl-srpm-macros
@ -98,6 +108,11 @@ Red Hat specific rpm configuration files.
%patch22 -p1 %patch22 -p1
%patch23 -p1 %patch23 -p1
%patch24 -p1 %patch24 -p1
%patch25 -p1
# Only make docs change in Fedora 20+
%if 0%{?fedora} >= 20
%patch26 -p1
%endif
%build %build
@ -119,6 +134,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sysconfdir}/rpm/* %{_sysconfdir}/rpm/*
%changelog %changelog
* Wed Jul 24 2013 Kevin Fenzi <kevin@scrye.com> 9.1.0-50
- Make docdirs unversioned on Fedora 20+ (#986871)
- Hack around libtool issue for hardened build for now (#978949)
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 9.1.0-49 * Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 9.1.0-49
- Perl 5.18 rebuild - Perl 5.18 rebuild