From f33ae77937980b42f3c31f281054b5e4bdafa64e Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Thu, 23 Aug 2012 15:26:18 +0200
Subject: [PATCH] sun-java7: fixes after tests on arm; jpackage-utils has to be
 added as a requirement in rpm

---
 SRPMS/sun-java7/sun-java7.spec.in | 25 ++++++-------------------
 VERSION                           |  2 +-
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/SRPMS/sun-java7/sun-java7.spec.in b/SRPMS/sun-java7/sun-java7.spec.in
index e1073e2..bd636dc 100644
--- a/SRPMS/sun-java7/sun-java7.spec.in
+++ b/SRPMS/sun-java7/sun-java7.spec.in
@@ -37,29 +37,16 @@ Source:        LICENSE
 #Source2:       http://download.oracle.com/otn-pub/java/jdk/7u6-b24/jdk-%{version}-linux-arm-sfp.tar.gz
 #Source3:       sun-java7-jdk-profile
 #Source4:       sun-java7-jre-profile
+BuildRequires: jpackage-utils
 Provides:      jdk = %{version}
 Provides:      jdk2 = %{version}
 License:       Oracle Binary Code License
-## AUTOBUILDREQ-BEGIN
-BuildRequires: glibc-devel
-BuildRequires: libalsa-devel
-BuildRequires: libodbc
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
-BuildRequires: libXi-devel
-BuildRequires: libXtst-devel
-## AUTOBUILDREQ-END
-BuildRequires: libXp
-BuildRequires: libXt
-BuildRequires: libSM
-BuildRequires: libICE
-BuildRequires: shared-mime-info
-BuildRequires: desktop-file-utils
+Requires:      shared-mime-info
+Requires:      desktop-file-utils
 Requires:      sun-java7-runtime = %{epoch}:%{version}-%{release}
 Requires:      menu-java
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
-
 %description
 Sun Java Developer's Kit.
 
@@ -76,7 +63,7 @@ Sun Java Platform Runtime Environment.
 %prep
 [ "%{toplevel_dir}" != / ] && rm -rf "%{toplevel_dir}"
 
-%setup -q -D -T -c
+%setup -q -T -c
 
 #echo yes | MORE=10000
 %ifarch %{ix86}
@@ -94,8 +81,8 @@ tar xf jdk-%{version}-linux-x64.tar.gz
 %ifarch arm
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-arm.tar.gz
-tar xf jdk-%{version}-linux-arm.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-arm-sfp.tar.gz
+tar xf jdk-%{version}-linux-arm-sfp.tar.gz
 %endif
 
 cd %{toplevel_dir}
diff --git a/VERSION b/VERSION
index 0a3ac84..b81dd52 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION = 2.3.10
+VERSION = 2.3.11.1