[jcharts] Remove version from JAR name

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Mar 27 14:30:55 UTC 2014


commit dfab412c94164acbed309fb946ef962201582bdd
Author: Michael Simacek <msimacek at redhat.com>
Date:   Tue Mar 25 09:56:28 2014 +0100

    Remove version from JAR name
    
    Signed-off-by: Michael Simacek <msimacek at redhat.com>
    Signed-off-by: Mikolaj Izdebski <mizdebsk at redhat.com>

 jcharts.spec |   30 +++++++++---------------------
 1 files changed, 9 insertions(+), 21 deletions(-)
---
diff --git a/jcharts.spec b/jcharts.spec
index 4ec88e9..42a6da3 100644
--- a/jcharts.spec
+++ b/jcharts.spec
@@ -1,14 +1,12 @@
 Name:		jcharts
 Version:	0.7.5
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A java based charts library
 
-Group:		Applications/Publishing
 License:	BSD
 URL:		http://jcharts.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/%{name}/jCharts-%{version}.zip
 Patch1:		jcharts_remove_legacy.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:	java-devel >= 1:1.6.0
@@ -29,9 +27,6 @@ volunteers for displaying charts via Servlets, JSP's, and Swing apps.
 
 %package	javadoc
 Summary:	Javadoc for %{name}
-Group:		Documentation
-Requires:	%{name} = %{version}-%{release}
-Requires:	jpackage-utils
 
 %description	javadoc
 Javadoc for %{name}.
@@ -51,35 +46,28 @@ ant jar javadocs -Dant.build.javac.source=1.4
 cd ..
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/jCharts-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/
-ln -sf %{_javadir}/jCharts-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p build/jCharts-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jCharts.jar
+ln -sf %{_javadir}/jCharts.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 #javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{_javadocdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %files
-%defattr(-,root,root,-)
 %doc docs/README.html docs/jCharts_license.txt
 %{_javadir}/%{name}.jar
-%{_javadir}/jCharts-%{version}.jar
+%{_javadir}/jCharts.jar
 
 %files	javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Mar 25 2014 Michael Simacek <msimacek at redhat.com> - 0.7.5-12
+- Remove version from JAR name
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.5-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list