rpms/flute/devel flute.spec,1.4,1.5

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	flute.spec 
Log Message:
post-release tuned for OpenOffice.org report-designer


Index: flute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flute/devel/flute.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- flute.spec	9 Mar 2009 10:28:08 -0000	1.4
+++ flute.spec	3 May 2009 14:06:01 -0000	1.5
@@ -2,12 +2,12 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: flute
-Version: 1.3
-Release: 5.20061107jfree%{?dist}
+Version: 1.3.0
+Release: 1.OOo31%{?dist}
 Summary: Java CSS parser using SAC
 License: W3C
 Group: System Environment/Libraries
-Source0: http://downloads.sourceforge.net/jfreereport/%{name}-1.3-jfree-20061107.tar.gz
+Source0: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}-OOo31.zip
 URL: http://www.w3.org/Style/CSS/SAC/
 BuildRequires: ant, java-devel, jpackage-utils, sac
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,22 +31,22 @@ Summary: Javadoc for %{name}
 Javadoc for %{name}.
 
 %prep
-%setup -q -n flute-1.3-jfree-20061107
+%setup -q -c
 find . -name "*.jar" -exec rm -f {} \;
+mkdir -p lib
 build-jar-repository -s -p lib sac
 
 %build
-cd ant
-ant compile javadoc
+ant jar javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p flute-1.3-jfree-20061107.jar $RPM_BUILD_ROOT%{_javadir}/flute.jar
+cp -p build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp build/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -67,7 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
-* Mon May 09 2009 Caolan McNamara <caolanm at redhat.com> - 1.3-5.20061107jfree
+* Sun May 03 2009 Caolan McNamara <caolanm at redhat.com> - 1.3.0-1.OOo31
+- post-release tuned for OpenOffice.org report-designer
+
+* Mon Mar 09 2009 Caolan McNamara <caolanm at redhat.com> - 1.3-5.20061107jfree
 - better adherence to versioning guidelines
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-5