[java-1.7.0-openjdk/f18] cosmetic changes

[jiri vanek]

commit e4fe6adc985cf4c780cf0d70a328368b6fae1e11
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Mon Aug 27 11:44:57 2012 +0200

    cosmetic changes
    
    - ALT_STRIP_POLICY replaced by STRIP_POLICY
    - Patch103 java-1.7.0-opendk-arm-fixes.patch split to itself and new
      Patch106 java-1.7.0-opendk-freetype-check-fix.patch by meaning. Both applied.

 java-1.7.0-openjdk-arm-fixes.patch          |   22 ----------------------
 java-1.7.0-openjdk-freetype-check-fix.patch |   22 ++++++++++++++++++++++
 java-1.7.0-openjdk.spec                     |   13 +++++++++++--
 3 files changed, 33 insertions(+), 24 deletions(-)
---
diff --git a/java-1.7.0-openjdk-arm-fixes.patch b/java-1.7.0-openjdk-arm-fixes.patch
index 47f28dc..fc8bf9d 100644
--- a/java-1.7.0-openjdk-arm-fixes.patch
+++ b/java-1.7.0-openjdk-arm-fixes.patch
@@ -1,25 +1,3 @@
-diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
---- openjdk/jdk/make/common/shared/Sanity.gmk.sav	2012-02-14 16:12:48.000000000 -0500
-+++ openjdk/jdk/make/common/shared/Sanity.gmk	2012-03-07 17:31:26.153840755 -0500
-@@ -814,12 +814,12 @@ ifdef OPENJDK
- 	@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
- 	    $(ECHO) "Failed to build freetypecheck." ) > $@
- 
--    sane-freetype: $(TEMPDIR)/freetypeinfo
--	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
--	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
--	          " or higher is required. \n" \
--		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
--	fi
-+#    sane-freetype: $(TEMPDIR)/freetypeinfo
-+#	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
-+#	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
-+#	          " or higher is required. \n" \
-+#		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
-+#	fi
-   else
-     #do nothing  (cross-compiling)
-     sane-freetype: 
 diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
 --- openjdk/jdk/make/jdk_generic_profile.sh.sav	2012-02-14 16:12:48.000000000 -0500
 +++ openjdk/jdk/make/jdk_generic_profile.sh	2012-03-07 17:31:26.154840740 -0500
diff --git a/java-1.7.0-openjdk-freetype-check-fix.patch b/java-1.7.0-openjdk-freetype-check-fix.patch
new file mode 100644
index 0000000..15c2d67
--- /dev/null
+++ b/java-1.7.0-openjdk-freetype-check-fix.patch
@@ -0,0 +1,22 @@
+diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk.sav	2012-02-14 16:12:48.000000000 -0500
++++ openjdk/jdk/make/common/shared/Sanity.gmk	2012-03-07 17:31:26.153840755 -0500
+@@ -814,12 +814,12 @@ ifdef OPENJDK
+ 	@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
+ 	    $(ECHO) "Failed to build freetypecheck." ) > $@
+ 
+-    sane-freetype: $(TEMPDIR)/freetypeinfo
+-	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
+-	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
+-	          " or higher is required. \n" \
+-		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
+-	fi
++#    sane-freetype: $(TEMPDIR)/freetypeinfo
++#	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
++#	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
++#	          " or higher is required. \n" \
++#		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
++#	fi
+   else
+     #do nothing  (cross-compiling)
+     sane-freetype: 
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 85d2d24..d0bcb15 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -153,7 +153,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}%{?dist}.1
+Release: %{icedtea_version}%{?dist}.2
 # 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
@@ -272,6 +272,8 @@ Patch103: %{name}-arm-fixes.patch
 Patch104: %{name}-ppc-zero-jdk.patch
 Patch105: %{name}-ppc-zero-hotspot.patch
 
+Patch106: %{name}-freetype-check-fix.patch
+
 #
 # Bootstrap patches (code with this is never shipped)
 #
@@ -727,6 +729,8 @@ patch -l -p0 < %{PATCH102}
 patch -l -p0 < %{PATCH103}
 %endif
 
+patch -l -p0 < %{PATCH106}
+
 %ifarch ppc ppc64
 # PPC fixes
 patch -l -p0 < %{PATCH104}
@@ -897,7 +901,7 @@ make \
   FT2_LIBS="-lfreetype " \
   DEBUG_CLASSFILES="true" \
   DEBUG_BINARIES="true" \
-  ALT_STRIP_POLICY="no_strip" \
+  STRIP_POLICY="no_strip" \
 %ifnarch %{jit_arches}
   LIBFFI_CFLAGS="`pkg-config --cflags libffi` " \
   LIBFFI_LIBS="-lffi " \
@@ -1432,6 +1436,11 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Mon Aug 27 2012 Jiri Vanek <jvanek at redhat.com> - 1.7.0.6-2.3.fc18.2
+- ALT_STRIP_POLICY replaced by STRIP_POLICY
+- Patch103 java-1.7.0-opendk-arm-fixes.patch split to itself and new 
+  Patch106 java-1.7.0-opendk-freetype-check-fix.patch by meaning. Both applied.
+
 * Mon Aug 20 2012 jiri Vanek <jvanek at redhat.com> - 1.7.0.6-2.3.fc18.1
 - Updated to latest IcedTea7-forest-2.3
 - Current build is u6