[jericho-html] Remove versioned jars (bug #1022118)

[Orion Poplawski]

commit 9c1bba3b68250020c3edd2537bb5c004a2d38056
Author: Orion Poplawski <orion at nwra.com>
Date:   Tue Oct 22 10:00:36 2013 -0600

    Remove versioned jars (bug #1022118)

 jericho-html.spec |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/jericho-html.spec b/jericho-html.spec
index 136c718..8f6bda8 100644
--- a/jericho-html.spec
+++ b/jericho-html.spec
@@ -1,6 +1,6 @@
 Name:           jericho-html
 Version:        3.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java library allowing analysis and manipulation of parts of an HTML document
 
 Group:          Development/Libraries
@@ -53,24 +53,23 @@ find \( -name '*.java' -o -name '*.bat' -o -name '*.txt' -o -name '*.jsp' -o -na
 export CLASSPATH=$(build-classpath slf4j/api commons-logging log4j)
 
 javac -Xlint -g:none -d classes -encoding Windows-1252 src/java/net/htmlparser/jericho/*.java src/java/net/htmlparser/jericho/nodoc/*.java
-jar -cf dist/%{name}-%{version}.jar -C classes .
+jar -cf dist/%{name}.jar -C classes .
 
 javadoc -encoding Windows-1252 -quiet -windowtitle "Jericho HTML Parser %version" -use -d docs/javadoc -subpackages net.htmlparser.jericho -exclude net.htmlparser.jericho.nodoc -noqualifier net.htmlparser.jericho -group "Core Package" src/java/net/htmlparser/jericho/*.java src/java/net/htmlparser/jericho/nodoc/*.java
 cat docs/src/append/stylesheet.css >> docs/javadoc/stylesheet.css
 cp docs/src/replace/*.* docs/javadoc
 
-javac -Xlint -g -deprecation -classpath dist/%{name}-%{version}.jar -d samples/console/classes samples/console/src/*.java
+javac -Xlint -g -deprecation -classpath dist/%{name}.jar -d samples/console/classes samples/console/src/*.java
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
 cp -rp docs/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # Install link for web app
-ln -s %{_javadir}/%{name}-%{version}.jar samples/webapps/JerichoHTML/WEB-INF/lib
+ln -s %{_javadir}/%{name}.jar samples/webapps/JerichoHTML/WEB-INF/lib
 
 
 %check
@@ -91,7 +90,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc project-description.txt release.txt
 %doc samples
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
 
 %files javadoc
 %doc licence-epl-1.0.html licence-lgpl-2.1.txt licence.txt
@@ -100,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 22 2013 Orion Poplawski <orion at cora.nwra.com> - 3.2-7
+- Remove versioned jars (bug #1022118)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild