[java-1.6.0-openjdk/f15/master] fix autogen vs. patch5 order
Dan Horák
sharkcz at fedoraproject.org
Tue Apr 12 13:31:36 UTC 2011
commit 7553ba68a8f5c4ad26e64668d0c2b73048759022
Author: Dan Horák <dan at danny.cz>
Date: Tue Apr 12 15:31:38 2011 +0200
fix autogen vs. patch5 order
java-1.6.0-openjdk.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 6224199..1c20f1b 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -139,7 +139,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 55.%{icedteaver}%{?dist}
+Release: 56.%{icedteaver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -369,10 +369,11 @@ export ARCH_DATA_MODEL=64
%ifarch alpha
export CFLAGS="$CFLAGS -mieee"
%endif
-./autogen.sh
patch -l -p0 < %{PATCH5}
+./autogen.sh
+
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
--with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
--with-hotspot-build=hs20 --with-hotspot-src-zip=%{SOURCE7} \
@@ -889,6 +890,9 @@ exit 0
%changelog
+* Tue Apr 12 2011 Dan Horák <dan[at]danny.cz> 1:1.6.0.0-56.1.10
+- fix autogen vs. patch5 order
+
* Tue Mar 15 2011 Jiri Vanek <javenk at redhat.com> 1:1.6.0.0-55.1.10
-removed plugin
-bumped to icedtea 1.10
More information about the scm-commits
mailing list