rpms/jcommon/devel jcommon.spec,1.3,1.4

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/jcommon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15985

Modified Files:
	jcommon.spec 
Log Message:
versioning is a pita


Index: jcommon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jcommon/devel/jcommon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jcommon.spec	3 May 2008 10:11:31 -0000	1.3
+++ jcommon.spec	8 May 2008 08:45:23 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name: jcommon
 Version: 1.0.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: JFree Java utility classes
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -58,8 +58,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cp -p %{name}-xml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xml-%{version}.jar
+cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p %{name}-xml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xml.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -106,16 +106,16 @@
 %files
 %defattr(0644,root,root,0755)
 %doc licence-LGPL.txt README.txt
-%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
 %if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}.jar.*
 %endif
 
 %files xml
 %defattr(0644,root,root,0755)
-%{_javadir}/%{name}-xml-%{version}.jar
+%{_javadir}/%{name}-xml.jar
 %if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-xml-%{version}.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-xml.jar.*
 %endif
 
 %files javadoc
@@ -123,6 +123,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 07 2008 Caolan McNamara <caolanm at redhat.com> 1.0.12-4
+- shuffle around
+
 * Thu May 01 2008 Caolan McNamara <caolanm at redhat.com> 1.0.12-3
 - fix review problems and add jcommon-xml subpackage