rpms/jcommon-serializer/devel .cvsignore, 1.3, 1.4 jcommon-serializer.spec, 1.4, 1.5 sources, 1.3, 1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/jcommon-serializer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24474

Modified Files:
	.cvsignore jcommon-serializer.spec sources 
Log Message:
OOo tuned serializer


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jcommon-serializer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Mar 2009 10:50:47 -0000	1.3
+++ .cvsignore	16 Mar 2009 12:16:31 -0000	1.4
@@ -1 +1,2 @@
 jcommon-serializer-0.3.0.tar.gz
+libserializer-1.0.0-OOo31.zip


Index: jcommon-serializer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jcommon-serializer/devel/jcommon-serializer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jcommon-serializer.spec	9 Mar 2009 10:50:47 -0000	1.4
+++ jcommon-serializer.spec	16 Mar 2009 12:16:31 -0000	1.5
@@ -3,11 +3,12 @@
 
 Name: jcommon-serializer
 Version: 0.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: JFree Java General Serialization Framework
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz
+Source1: http://downloads.sourceforge.net/jfreereport/libserializer-1.0.0-OOo31.zip
 URL: http://www.jfree.org/jfreereport/jcommon-serializer
 BuildRequires: ant, java-devel, jpackage-utils, libbase >= 1.0.0
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,15 +40,22 @@
 %patch1 -p1 -b .depends
 find . -name "*.jar" -exec rm -f {} \;
 build-jar-repository -s -p lib libbase commons-logging-api
+unzip -qq %{SOURCE1} -d serializer
+cd serializer
+mkdir -p lib
+build-jar-repository -s -p lib libbase commons-logging-api
 
 %build
 ant compile javadoc
+cd serializer
+ant jar
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p serializer/build/lib/libserializer.jar $RPM_BUILD_ROOT%{_javadir}/libserializer.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -78,6 +86,7 @@
 %defattr(0644,root,root,0755)
 %doc ChangeLog.txt licence-LGPL.txt README.txt
 %{_javadir}/%{name}.jar
+%{_javadir}/libserializer.jar
 %if %{with_gcj}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
@@ -87,6 +96,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Mar 16 2009 Caolan McNamara <caolanm at redhat.com> 0.3.0-2
+- OOo tuned serializer
+
 * Mon Mar 09 2009 Caolan McNamara <caolanm at redhat.com> 0.3.0-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jcommon-serializer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Mar 2009 10:50:47 -0000	1.3
+++ sources	16 Mar 2009 12:16:31 -0000	1.4
@@ -1 +1,2 @@
 06fa39275c38befc57691e45854fb549  jcommon-serializer-0.3.0.tar.gz
+406d720aefd6b2baa0518d042628b7d9  libserializer-1.0.0-OOo31.zip