[java-1.7.0-openjdk/f19] - buildver replaced by updatever - buildver reset to 60 - updatever set to 40 - added JDK_BUILD_NU

[jiri vanek]

commit 98aab95df480b79f1248c13f29bc716151259f20
Author: Jiri Vanek work <jvanek at judovana.home>
Date:   Wed Sep 11 10:10:18 2013 +0200

    - buildver replaced by updatever
    - buildver reset to 60
    - updatever set to 40
    - added   JDK_BUILD_NUMBER=b`printf "%02d" buildver to make parameters
    - buildversion included in id
    - desktop icons extracted to text files

 java-1.7.0-openjdk.spec |   38 ++++++++++++++++++++++++--------------
 jconsole.desktop        |   10 ++++++++++
 policytool.desktop      |   10 ++++++++++
 sources                 |    1 -
 4 files changed, 44 insertions(+), 15 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 796b4a6..01d61c8 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -101,9 +101,11 @@
 
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
+%global updatever        40
+#Fedora have an bogus 60 instead of updatever. Fix when updatever>=60 in version:
 %global buildver        60
-# Keep priority on 6digits in case buildver>9
-%global priority        1700%{buildver}
+# Keep priority on 6digits in case updatever>9
+%global priority        1700%{updatever}
 %global javaver         1.7.0
 
 %global sdkdir          %{uniquesuffix}
@@ -140,8 +142,8 @@
 %global __jar_repack 0
 
 Name:    java-%{javaver}-%{origin}
-Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.0%{?dist}
+Version: %{javaver}.60
+Release: %{icedtea_version}.1%{?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
@@ -187,8 +189,9 @@ Source5: class-rewriter.tar.gz
 # Systemtap tapsets. Zipped up to keep it small.
 Source6: systemtap-tapset.tar.gz
 
-# .desktop files. Zipped up to keep it small.
-Source7: desktop-files.tar.gz
+# .desktop files. 
+Source7:  policytool.desktop
+Source77: jconsole.desktop
 
 # nss configuration file
 Source8: nss.cfg
@@ -474,8 +477,6 @@ done
 tar xzf %{SOURCE9}
 %endif
 
-# Extract desktop files
-tar xzf %{SOURCE7}
 
 %patch3
 %patch4
@@ -580,8 +581,9 @@ make \
   UNLIMITED_CRYPTO=true \
   ANT="/usr/bin/ant" \
   DISTRO_NAME="Fedora" \
-  DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch}" \
-  JDK_UPDATE_VERSION=`printf "%02d" %{buildver}` \
+  DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch} u%{updatever}-b%{buildver}" \
+  JDK_UPDATE_VERSION=`printf "%02d" %{updatever}` \
+  JDK_BUILD_NUMBER=b`printf "%02d" %{buildver}` \
   MILESTONE="fcs" \
   HOTSPOT_BUILD_JOBS="$NUM_PROC" \
   STATIC_CXX="false" \
@@ -758,11 +760,11 @@ done
 
 # Install desktop files.
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
-for e in jconsole policytool ; do
-    sed -i "s/#ARCH#/%{_arch}-%{release}/g" $e.desktop
-    sed -i "s|/usr/bin|%{sdkbindir}/|g" $e.desktop
+for e in %{SOURCE7} %{SOURCE77} ; do
+    sed -i "s/#ARCH#/%{_arch}-%{release}/g" $e
+    sed -i "s|/usr/bin|%{sdkbindir}/|g" $e
     desktop-file-install --vendor=%{uniquesuffix} --mode=644 \
-        --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
+        --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e
 done
 
 # Install /etc/.java/.systemPrefs/ directory
@@ -1288,6 +1290,14 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Wed Sep 11 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.40-2.4.2.1.f19
+- buildver replaced by updatever
+- buildver reset to 60
+- updatever set to 40
+- added   JDK_BUILD_NUMBER=b`printf "%02d" buildver to make parameters
+- buildversion included in id
+- desktop icons extracted to text files
+
 * Fri Sep 06 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.4.2.0.f19
 - updated to icedtea7-forest 2.4.2
 - removed upstreamed patch404  aarch64.patch
diff --git a/jconsole.desktop b/jconsole.desktop
new file mode 100644
index 0000000..f7904c6
--- /dev/null
+++ b/jconsole.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK Monitoring & Management Console #ARCH#
+Comment=Monitor and manage OpenJDK applications for #ARCH#
+Exec=/usr/bin/jconsole
+Icon=java-1.7.0
+Terminal=false
+Type=Application
+StartupWMClass=sun-tools-jconsole-JConsole
+Categories=Development;Monitor;Java;
+Version=1.0
diff --git a/policytool.desktop b/policytool.desktop
new file mode 100644
index 0000000..b0841b3
--- /dev/null
+++ b/policytool.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK Policy Tool #ARCH#
+Comment=Manage OpenJDK policy files for #ARCH#
+Exec=/usr/bin/policytool
+Icon=java-1.7.0
+Terminal=false
+Type=Application
+StartupWMClass=sun-security-tools-PolicyTool
+Categories=Development;Java;
+Version=1.0
diff --git a/sources b/sources
index 13d5a94..c760386 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
 ea344cc5b53b73f375558ba41760ff64  class-rewriter.tar.gz
-200676ae97998b6f5bc18ff77e35d222  desktop-files.tar.gz
 1cb61996cf5dbe80827abbe7d009bf28  pulseaudio.tar.gz
 8eb5ad93dbf2f4fe86e52631969cfb09  systemtap-tapset.tar.gz
 4bf2b37d85cf71fc3611aa772ffe1553  openjdk-icedtea-2.4.2.tar.xz