[rhino] Fix version number of the package.

[Matej Cepl]

commit 4cfe1480618de483c05ff3e13586b31e7c299144
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Sep 16 21:56:35 2011 +0200

    Fix version number of the package.

 rhino.spec |   57 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 31 insertions(+), 26 deletions(-)
---
diff --git a/rhino.spec b/rhino.spec
index 7095b21..6d36964 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -31,9 +31,11 @@
 %define cvs_version 1_7R3
 
 Name:           rhino
-Version:        1.7
-Release:        0.10.r3%{?dist}
-Epoch:          0
+# R3 doesn't mean a prerelease, but behind R there is a version of this implementation
+# of Javascript version 1.7 (which is independent from this particular implementation,
+# e.g., there is C++ implementation in Spidermonkey)
+Version:        1.7R3
+Release:        1%{?dist}
 Summary:        JavaScript for Java
 License:        MPLv1.1 or GPLv2+
 
@@ -48,7 +50,7 @@ Patch0:         %{name}-build.patch
 Patch1:         %{name}-addOrbitManifest.patch
 
 URL:            http://www.mozilla.org/rhino/
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 
 BuildRequires:  ant
 BuildRequires:  bea-stax-api
@@ -60,7 +62,7 @@ Requires:       jline
 #Requires:       xmlbeans
 #BuildRequires:  xmlbeans
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Rhino is an open-source implementation of JavaScript written entirely
@@ -69,7 +71,7 @@ scripting to end users.
 
 %package        demo
 Summary:        Examples for %{name}
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 
 %description    demo
 Examples for %{name}.
@@ -77,14 +79,14 @@ Examples for %{name}.
 %package        manual
 
 Summary:        Manual for %{name}
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 
 %description    manual
 Documentation for %{name}.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 
 %description    javadoc
 Javadoc for %{name}.
@@ -110,8 +112,6 @@ export OPT_JAR_LIST=:
      -Djsr173.jar=$(build-classpath bea-stax-api) deepclean jar copy-all javadoc
 
 pushd examples
-# xbeans component is optional. Disabled until we can get it into Fedora
-#export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean)
 
 export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
 %{javac} *.java
@@ -119,28 +119,28 @@ export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbean
 popd
 
 %install
-%__rm -rf %{buildroot}
+rm -rf %{buildroot}
 
 # jars
-%{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -a build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-%{__cp} -a build/%{name}%{cvs_version}/%{name}-examples-%{version}.jar %{buildroot}%{_javadir}/%{name}-examples-%{version}.jar
-(cd %{buildroot}%{_javadir} && %{__ln_s} %{name}-%{version}.jar js-%{version}.jar)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`; done)
+mkdir -p %{buildroot}%{_javadir}
+cp -a build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+cp -a build/%{name}%{cvs_version}/%{name}-examples-%{version}.jar %{buildroot}%{_javadir}/%{name}-examples-%{version}.jar
+(cd %{buildroot}%{_javadir} && ln -s %{name}-%{version}.jar js-%{version}.jar)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`; done)
 
 # javadoc
-%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__cp} -a build/%{name}%{cvs_version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-%{_bindir}/find %{buildroot}%{_javadocdir}/%{name}-%{version} -type f -name '*.html' | %{_bindir}/xargs %{__perl} -pi -e 's/\r$//g'
+mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -a build/%{name}%{cvs_version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+find %{buildroot}%{_javadocdir}/%{name}-%{version} -type f -name '*.html' | xargs sed -i -e 's/\r$//g'
 
 ## script
-%__mkdir_p %{buildroot}%{_bindir}
-%__install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
+mkdir -p %{buildroot}%{_bindir}
+install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
 
 # examples
-%{__mkdir_p} %{buildroot}%{_datadir}/%{name}
-%{__cp} -a examples/* %{buildroot}%{_datadir}/%{name}
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -a examples/* %{buildroot}%{_datadir}/%{name}
 
 %clean
 %__rm -rf %{buildroot}
@@ -165,6 +165,11 @@ popd
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Sep 16 2011 Matěj Cepl <mcepl at redhat.com> - 1.7R3-1
+- Fix numbering of the package (this is not a prerelease)
+- Remove unnecessary macros
+- Increase happines of rpmlint (better Group tags)
+
 * Wed Sep 14 2011 Matěj Cepl <mcepl at redhat.com> - 1.7-0.10.r3
 - New upstream pre-release.
 
@@ -202,7 +207,7 @@ popd
 - fix license tag
 
 * Thu Mar 15 2007 Matt Wringe <mwringe at redhat.com> 0:1.6-0.1.r5.1jpp.2
-- Remove script from build as the debugging tool is disabled due to it 
+- Remove script from build as the debugging tool is disabled due to it
   containing proprietary code from Sun.
 
 * Wed Mar 07 2007 Deepak Bhole <dbhole at redhat.com> 0:1.6-0.1.r5.1jpp.1
@@ -213,7 +218,7 @@ popd
 - Remove post/postuns for javadoc and add the two dirs as %%doc
 
 * Wed Jun 14 2006 Ralph Apel <r.apel at r-apel.de> 0:1.6-0.r2.2jpp
-- Add bea-stax-api in order to build xmlimpl classes 
+- Add bea-stax-api in order to build xmlimpl classes
 
 * Tue May 31 2006 Fernando Nasser <fnasser at redhat.com> 0:1.6-0.r2.1jpp
 - Upgrade to RC2