rpms/jcommon-serializer/devel jcommon-serializer.spec, 1.6, 1.7 sources, 1.4, 1.5

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/jcommon-serializer/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26003

Modified Files:
	jcommon-serializer.spec sources 
Log Message:
re-build post-libserializer


Index: jcommon-serializer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jcommon-serializer/devel/jcommon-serializer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- jcommon-serializer.spec	24 Jul 2009 09:07:31 -0000	1.6
+++ jcommon-serializer.spec	2 Jul 2010 19:19:26 -0000	1.7
@@ -3,12 +3,11 @@
 
 Name: jcommon-serializer
 Version: 0.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: JFree Java General Serialization Framework
 License: LGPLv2+
 Group: System Environment/Libraries
 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)
@@ -43,22 +42,15 @@ Javadoc for %{name}.
 %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}
@@ -89,7 +81,6 @@ fi
 %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
@@ -99,23 +90,26 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
-* Fri Jul 24 2009 Caolan McNamara <caolanm at redhat.com> 0.3.0-3
+* Fri Jul 02 2010 Caolán McNamara <caolanm at redhat.com> 0.3.0-4
+- re-build post-libserializer
+
+* Fri Jul 24 2009 Caolán McNamara <caolanm at redhat.com> 0.3.0-3
 - make javadoc no-arch when building as arch-dependant aot
 
-* Mon Mar 16 2009 Caolan McNamara <caolanm at redhat.com> 0.3.0-2
+* Mon Mar 16 2009 Caolán 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
+* Mon Mar 09 2009 Caolán McNamara <caolanm at redhat.com> 0.3.0-1
 - latest version
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed May 07 2008 Caolan McNamara <caolanm at redhat.com> 0.2.0-3
+* Wed May 07 2008 Caolán McNamara <caolanm at redhat.com> 0.2.0-3
 - reshuffle
 
-* Tue May 06 2008 Caolan McNamara <caolanm at redhat.com> 0.2.0-2
+* Tue May 06 2008 Caolán McNamara <caolanm at redhat.com> 0.2.0-2
 - take review notes
 
-* Sat May 03 2008 Caolan McNamara <caolanm at redhat.com> 0.2.0-1
+* Sat May 03 2008 Caolán McNamara <caolanm at redhat.com> 0.2.0-1
 - initial fedora import


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jcommon-serializer/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Mar 2009 12:16:31 -0000	1.4
+++ sources	2 Jul 2010 19:19:27 -0000	1.5
@@ -1,2 +1 @@
 06fa39275c38befc57691e45854fb549  jcommon-serializer-0.3.0.tar.gz
-406d720aefd6b2baa0518d042628b7d9  libserializer-1.0.0-OOo31.zip