[javacc] - Fixing #835786 - javacc: Invalid upstream URL - Minor spec file changes according to the latest gu

[Jaromír Cápík]

commit 4018b48f77242364604c88d73191640cf3bcbe0c
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Thu Jun 28 12:54:26 2012 +0200

    - Fixing #835786 - javacc: Invalid upstream URL
    - Minor spec file changes according to the latest guidelines

 javacc.spec |   42 ++++++++++++++++--------------------------
 1 files changed, 16 insertions(+), 26 deletions(-)
---
diff --git a/javacc.spec b/javacc.spec
index 793a54f..2a3f3b9 100644
--- a/javacc.spec
+++ b/javacc.spec
@@ -30,19 +30,18 @@
 
 Name:           javacc
 Version:        5.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
-Source0:        https://javacc.dev.java.net/files/documents/17/142527/%{name}-%{version}src.tar.gz
+Source0:        http://java.net/projects/%{name}/downloads/download/%{name}-%{version}src.tar.gz
 Source1:        javacc.sh
 Source2:        jjdoc
 Source3:        jjtree
 #Jar used for bootstrapping
 Source4:        javacc.jar
-URL:            https://javacc.dev.java.net/
+URL:            http://javacc.java.net/
 Group:          Development/Tools
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires:       java, jpackage-utils >= 0:1.5
 BuildRequires:  ant, ant-junit, junit >= 0:3.8.1
 BuildRequires:  java-devel, jpackage-utils >= 0:1.5
@@ -94,31 +93,20 @@ find . -name "*.jar" -exec rm {} \;
 ant jar
 
 %install
-rm -fr $RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 bin/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -d -m 755 $RPM_BUILD_ROOT/%{_bindir}
-install -pD -T -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/javacc.sh
-install -pD -T -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/jjdoc
-install -pD -T -m 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/jjtree
+# jar
+install -Dpm 644 bin/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+# bin
+install -Dp -T -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/javacc.sh
+install -Dp -T -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/jjdoc
+install -Dp -T -m 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/jjtree
 
-%add_to_maven_depmap net.java.dev.javacc %{name} %{version} JPP %{name}
+# pom
+install -Dpm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*.jar
 %doc LICENSE README
 %{_bindir}/*
@@ -126,14 +114,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mavendepmapfragdir}/*
 
 %files manual
-%defattr(-,root,root,-)
 %doc www/*
 
 %files demo
-%defattr(-,root,root,-)
 %doc examples
 
 %changelog
+* Tue Jun 28 2012 Jaromir Capik <jcapik at redhat.com> 0:5.0-6
+- Fixing #835786 - javacc: Invalid upstream URL
+- Minor spec file changes according to the latest guidelines
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:5.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild