Fix java builds

This commit is contained in:
Elliot Lee 2005-02-09 15:09:11 +00:00
parent 89e3065f19
commit 1518ff2d14
2 changed files with 4 additions and 4 deletions

2
macros
View File

@ -151,4 +151,4 @@ unset DISPLAY\
%__find_provides /usr/lib/rpm/redhat/find-provides %__find_provides /usr/lib/rpm/redhat/find-provides
%__find_requires /usr/lib/rpm/redhat/find-requires %__find_requires /usr/lib/rpm/redhat/find-requires
%__global_cflags -O2 -g -pipe -D_FORTIFY_SOURCE=2 %__global_cflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2

View File

@ -1,6 +1,6 @@
Summary: Red Hat specific rpm configuration files. Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 8.0.32 Version: 8.0.33
Release: 1 Release: 1
License: GPL License: GPL
Group: Development/System Group: Development/System
@ -9,7 +9,6 @@ BuildArch: noarch
#Requires: rpmbuild(VendorConfig) <= 4.1 #Requires: rpmbuild(VendorConfig) <= 4.1
#Requires: mktemp #Requires: mktemp
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
# rpmrc passes -mtune which first appeared in gcc 3.4 # rpmrc passes -mtune which first appeared in gcc 3.4
%ifarch i386 i686 sparc %ifarch i386 i686 sparc
Conflicts: gcc < 3.4 Conflicts: gcc < 3.4
@ -36,7 +35,8 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat %{_prefix}/lib/rpm/redhat
%changelog %changelog
* Mon Nov 15 2004 Elliot Lee <sopwith@redhat.com> 8.0.33-1 * Wed Feb 9 2005 Elliot Lee <sopwith@redhat.com> 8.0.33-1
- Change -D to -Wp,-D to make java happy
- Add -D_FORTIFY_SOURCE=2 to global cflags (as per Jakub & Arjan's request) - Add -D_FORTIFY_SOURCE=2 to global cflags (as per Jakub & Arjan's request)
* Fri Oct 1 2004 Bill Nottingham <notting@redhat.com> 8.0.32-1 * Fri Oct 1 2004 Bill Nottingham <notting@redhat.com> 8.0.32-1