rpms/libformula/devel .cvsignore, 1.3, 1.4 libformula.spec, 1.3, 1.4 sources, 1.3, 1.4 libformula-0.2.0-builddepends.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/libformula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25754

Modified Files:
	.cvsignore libformula.spec sources 
Removed Files:
	libformula-0.2.0-builddepends.patch 
Log Message:
post-release tuned for OpenOffice.org report-designer


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libformula/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Mar 2009 10:59:27 -0000	1.3
+++ .cvsignore	16 Mar 2009 11:20:28 -0000	1.4
@@ -1 +1 @@
-libformula-0.2.0.tar.gz
+libformula-0.2.0-OOo31.zip


Index: libformula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libformula/devel/libformula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libformula.spec	9 Mar 2009 10:59:27 -0000	1.3
+++ libformula.spec	16 Mar 2009 11:20:28 -0000	1.4
@@ -3,15 +3,15 @@
 
 Name: libformula
 Version: 0.2.0
-Release: 1%{?dist}
+Release: 2.OOo31%{?dist}
 Summary: Formula Parser
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}-OOo31.zip
 URL: http://reporting.pentaho.org/
 BuildRequires: ant, java-devel, jpackage-utils, libbase >= 1.0.0
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, libbase >= 1.0.0
+Requires: java, jpackage-utils, jakarta-commons-logging, libbase >= 1.0.0
 %if %{with_gcj}
 BuildRequires: java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
@@ -19,7 +19,6 @@
 %else
 BuildArch: noarch
 %endif
-Patch0: libformula-0.2.0-builddepends.patch
 
 %description
 LibFormula provides Excel-Style-Expressions. The implementation provided
@@ -36,22 +35,22 @@
 Javadoc for %{name}.
 
 %prep
-%setup -q
+%setup -q -c
 find . -name "*.jar" -exec rm -f {} \;
+mkdir -p lib
 build-jar-repository -s -p lib commons-logging-api libbase
-%patch0 -p1 -b.builddepends.patch
 
 %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/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.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
@@ -88,6 +87,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Mar 16 2009 Caolan McNamara <caolanm at redhat.com> 0.2.0-2.OOo31
+- post-release tuned for OpenOffice.org report-designer
+
 * Mon Mar 09 2009 Caolan McNamara <caolanm at redhat.com> 0.2.0-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libformula/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Mar 2009 10:59:27 -0000	1.3
+++ sources	16 Mar 2009 11:20:28 -0000	1.4
@@ -1 +1 @@
-f4eb36ae9e4ea77cdb724a6e99106ec8  libformula-0.2.0.tar.gz
+b9c65b1fe1f9aa0faf9847d9b4225dfe  libformula-0.2.0-OOo31.zip


--- libformula-0.2.0-builddepends.patch DELETED ---