rpms/pentaho-reporting-flow-engine/devel .cvsignore, 1.2, 1.3 pentaho-reporting-flow-engine.spec, 1.2, 1.3 sources, 1.2, 1.3 pentaho-reporting-flow-engine-0.9.3-depends.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25442

Modified Files:
	.cvsignore pentaho-reporting-flow-engine.spec sources 
Removed Files:
	pentaho-reporting-flow-engine-0.9.3-depends.patch 
Log Message:
OOo tuned version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Sep 2008 20:37:43 -0000	1.2
+++ .cvsignore	16 Mar 2009 17:22:24 -0000	1.3
@@ -1 +1 @@
-pentaho-reporting-flow-engine-0.9.3.tar.gz
+flow-engine-0.9.2-OOo31.zip


Index: pentaho-reporting-flow-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel/pentaho-reporting-flow-engine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pentaho-reporting-flow-engine.spec	26 Feb 2009 10:35:14 -0000	1.2
+++ pentaho-reporting-flow-engine.spec	16 Mar 2009 17:22:24 -0000	1.3
@@ -2,18 +2,19 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: pentaho-reporting-flow-engine
-Version: 0.9.3
-Release: 3%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
 Summary: Pentaho Flow Reporting Engine
 License: LGPLv2+
+Epoch: 1
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/jfreereport/flow-engine-%{version}-OOo31.zip
 URL: http://reporting.pentaho.org/
-BuildRequires: ant, java-devel, jpackage-utils, jcommon, jcommon-serializer
+BuildRequires: ant, java-devel, jpackage-utils, libbase
 BuildRequires: libloader, libfonts, pentaho-libxml, xml-commons-apis
 BuildRequires: librepository, sac, flute, liblayout, libformula
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, jcommon, jcommon-serializer, libfonts >= 0.3.4
+Requires: java, jpackage-utils, libbase >= 1.0.0, libfonts >= 0.3.4
 Requires: pentaho-libxml, libformula >= 0.1.18, librepository >= 0.1.6
 Requires: sac, flute, liblayout >= 0.2.9
 %if %{with_gcj}
@@ -23,7 +24,6 @@
 %else
 BuildArch: noarch
 %endif
-Patch1: pentaho-reporting-flow-engine-0.9.3-depends.patch
 
 %description
 Pentaho Reporting Flow Engine is a free Java report library, formerly
@@ -39,23 +39,24 @@
 Javadoc for %{name}.
 
 %prep
-%setup -q
-%patch1 -p1 -b .depends
+%setup -q -c
+mkdir -p lib
 find . -name "*.jar" -exec rm -f {} \;
-build-jar-repository -s -p lib jcommon jcommon-serializer libloader libfonts \
-    libxml jaxp libformula librepository sac flute liblayout
+build-jar-repository -s -p lib commons-logging-api libbase libloader \
+    libfonts libxml jaxp libformula librepository sac flute liblayout \
+    libserializer
 
 %build
-ant compile javadoc
+ant jar javadoc
 
 %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 build/lib/flow-engine.jar $RPM_BUILD_ROOT%{_javadir}/flow-engine.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp build/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -92,6 +93,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Mar 16 2009 Caolan McNamara <caolanm at redhat.com> 0.9.2-1
+- OOo tuned version
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pentaho-reporting-flow-engine/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Sep 2008 20:37:43 -0000	1.2
+++ sources	16 Mar 2009 17:22:24 -0000	1.3
@@ -1 +1 @@
-247d05bdb543043a1c58ba7763c55bb5  pentaho-reporting-flow-engine-0.9.3.tar.gz
+4121d73be1d53746b78d6fd2ae440b6b  flow-engine-0.9.2-OOo31.zip


--- pentaho-reporting-flow-engine-0.9.3-depends.patch DELETED ---