rpms/libbase/devel .cvsignore, 1.2, 1.3 libbase.spec, 1.1, 1.2 sources, 1.2, 1.3

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	.cvsignore libbase.spec sources 
Log Message:
Post released tuned for OpenOffice.org reportbuilder


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libbase/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Mar 2009 10:10:28 -0000	1.2
+++ .cvsignore	16 Mar 2009 11:12:28 -0000	1.3
@@ -1 +1 @@
-libbase-1.0.0.tar.gz
+libbase-1.0.0-OOo31.zip


Index: libbase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbase/devel/libbase.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libbase.spec	9 Mar 2009 10:10:28 -0000	1.1
+++ libbase.spec	16 Mar 2009 11:12:28 -0000	1.2
@@ -3,11 +3,11 @@
 
 Name: libbase
 Version: 1.0.0
-Release: 1%{?dist}
+Release: 2.OOo31%{?dist}
 Summary: JFree Base Services
 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, jakarta-commons-logging
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,20 +25,32 @@
 configuration and initialization to other libraries and applications. The
 library is the root library for all Pentaho-Reporting projects.
 
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Development/Documentation
+Requires: %{name} = %{version}-%{release}
+Requires: jpackage-utils
+
+%description javadoc
+Javadoc for %{name}.
+
 %prep
-%setup -q
+%setup -q -c
+mkdir -p lib
 find . -name "*.jar" -exec rm -f {} \;
 build-jar-repository -s -p lib commons-logging-api
 
 %build
-ant compile
+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 build/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -70,6 +82,13 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
+%files javadoc
+%defattr(0644,root,root,0755)
+%{_javadocdir}/%{name}
+
 %changelog
+* Mon Mar 16 2009 Caolan McNamara <caolanm at redhat.com> 1.0.0-2.OOo31
+- Post released tuned for OpenOffice.org reportbuilder
+
 * Wed Dec 03 2008 Caolan McNamara <caolanm at redhat.com> 1.0.0-1
 - initial fedora import


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libbase/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Mar 2009 10:10:28 -0000	1.2
+++ sources	16 Mar 2009 11:12:28 -0000	1.3
@@ -1 +1 @@
-5907375823a3a9411a92d5131cd42307  libbase-1.0.0.tar.gz
+627cb48ed31aef78577651e5d9ace77e  libbase-1.0.0-OOo31.zip