Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
Jens Petersen | 2bac2534fc | |
Jens Petersen | 38be71db20 | |
Adam Jackson | 9096ff2778 |
|
@ -1,4 +1,2 @@
|
||||||
%rename cc1_options rh_cc1_options_old
|
|
||||||
|
|
||||||
*cc1_options:
|
*cc1_options:
|
||||||
%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}} %(rh_cc1_options_old)
|
+ %{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
%rename self_spec rh_self_spec_old
|
|
||||||
|
|
||||||
*self_spec:
|
*self_spec:
|
||||||
%{!shared:-pie} %(rh_self_spec_old)
|
+ %{!shared:-pie}
|
||||||
|
|
||||||
%rename link rh_link_old
|
|
||||||
|
|
||||||
*link:
|
*link:
|
||||||
-z now %(rh_link_old)
|
+ -z now
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- redhat-rpm-config-9.1.0/macros~ 2013-08-20 18:45:12.764205916 +0900
|
||||||
|
+++ redhat-rpm-config-9.1.0/macros 2013-08-20 18:46:45.657293197 +0900
|
||||||
|
@@ -18,6 +18,7 @@
|
||||||
|
%_mandir %{_prefix}/share/man
|
||||||
|
|
||||||
|
%_defaultdocdir %{_prefix}/share/doc
|
||||||
|
+%_pkgdocdir %{_docdir}/%{name}-%{version}
|
||||||
|
|
||||||
|
%_fmoddir %{_libdir}/gfortran/modules
|
||||||
|
|
|
@ -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: 37%{?dist}
|
Release: 37.2%{?dist}
|
||||||
# No version specified.
|
# No version specified.
|
||||||
License: GPL+
|
License: GPL+
|
||||||
Group: Development/System
|
Group: Development/System
|
||||||
|
@ -45,6 +45,8 @@ Patch15: 0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch
|
||||||
Patch16: redhat-rpm-config-9.1.0-filtering-spaces-in-filename.patch
|
Patch16: redhat-rpm-config-9.1.0-filtering-spaces-in-filename.patch
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=872737
|
# https://bugzilla.redhat.com/show_bug.cgi?id=872737
|
||||||
Patch17: redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch
|
Patch17: redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch
|
||||||
|
# backport _pkgdocdir macro from F20
|
||||||
|
Patch23: redhat-rpm-config-9.1.0-pkgdocdir.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Requires: coreutils
|
Requires: coreutils
|
||||||
Requires: perl-srpm-macros
|
Requires: perl-srpm-macros
|
||||||
|
@ -76,6 +78,7 @@ Red Hat specific rpm configuration files.
|
||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
%patch16 -p1
|
%patch16 -p1
|
||||||
%patch17 -p1
|
%patch17 -p1
|
||||||
|
%patch23 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
@ -97,6 +100,13 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||||
%{_sysconfdir}/rpm/*
|
%{_sysconfdir}/rpm/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 26 2013 Jens Petersen <petersen@redhat.com> - 9.1.0-37.2
|
||||||
|
- backport new _pkgdocdir macro from F20
|
||||||
|
|
||||||
|
* Wed May 29 2013 Adam Jackson <ajax@redhat.com> 9.1.0-37.1
|
||||||
|
- redhat-config-*: Use + to append rather than %%rename, to protect against
|
||||||
|
multiple -specs= ending up in the command line. (#892837)
|
||||||
|
|
||||||
* Fri Nov 9 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 9.1.0-37
|
* Fri Nov 9 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 9.1.0-37
|
||||||
- Patch to fix spaces in java jar files
|
- Patch to fix spaces in java jar files
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=872737
|
https://bugzilla.redhat.com/show_bug.cgi?id=872737
|
||||||
|
@ -208,7 +218,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||||
- add -srpm to the arches files so that the base language macros can
|
- add -srpm to the arches files so that the base language macros can
|
||||||
be parallel installable with these
|
be parallel installable with these
|
||||||
|
|
||||||
* Fri May 28 2011 Dennis Gilmore <dennis@ausil.us> - 9.1.0-6
|
* Fri May 27 2011 Dennis Gilmore <dennis@ausil.us> - 9.1.0-6
|
||||||
- add some specific macros needed at srpm creation time
|
- add some specific macros needed at srpm creation time
|
||||||
|
|
||||||
* Thu May 27 2010 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-5
|
* Thu May 27 2010 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-5
|
||||||
|
|
Loading…
Reference in New Issue