rpms/jcommon-serializer/devel jcommon-serializer-0.2.0-depends.patch, NONE, 1.1 jcommon-serializer.spec, 1.1, 1.2

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu May 8 08:56:58 UTC 2008


Author: caolanm

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

Modified Files:
	jcommon-serializer.spec 
Added Files:
	jcommon-serializer-0.2.0-depends.patch 
Log Message:
versioning is a PITA

jcommon-serializer-0.2.0-depends.patch:

--- NEW FILE jcommon-serializer-0.2.0-depends.patch ---
--- jcommon-serializer-0.2.0.orig/build.properties	2007-08-01 20:34:41.000000000 +0100
+++ jcommon-serializer-0.2.0/build.properties	2008-05-07 17:24:00.000000000 +0100
@@ -39,7 +39,7 @@
 #  Used libraries ...
 
 # Used by: core libraries
-jcommon-jar-file=jcommon-1.0.10.jar
+jcommon-jar-file=jcommon.jar
 
 ##############################################################
 #


Index: jcommon-serializer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jcommon-serializer/devel/jcommon-serializer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jcommon-serializer.spec	6 May 2008 16:34:40 -0000	1.1
+++ jcommon-serializer.spec	8 May 2008 08:56:22 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name: jcommon-serializer
 Version: 0.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: JFree Java General Serialization Framework
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -19,6 +19,7 @@
 %else
 BuildArch: noarch
 %endif
+Patch1: jcommon-serializer-0.2.0-depends.patch
 
 %description
 Jcommon-serializer is a general serialization framework used by JFreeChart,
@@ -35,8 +36,9 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .depends
 find . -name "*.jar" -exec rm -f {} \;
-ln -s %{_javadir}/jcommon-1.0.12.jar lib/jcommon-1.0.10.jar
+build-jar-repository -s -p lib jcommon
 
 %build
 ant compile javadoc
@@ -45,7 +47,7 @@
 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}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -75,7 +77,7 @@
 %files
 %defattr(0644,root,root,0755)
 %doc ChangeLog.txt licence-LGPL.txt README.txt
-%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
 %if %{with_gcj}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
@@ -85,6 +87,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 07 2008 Caolan McNamara <caolanm at redhat.com> 0.2.0-3
+- reshuffle
+
 * Tue May 06 2008 Caolan McNamara <caolanm at redhat.com> 0.2.0-2
 - take review notes
 




More information about the scm-commits mailing list