rpms/liblayout/devel .cvsignore, 1.2, 1.3 liblayout.spec, 1.2, 1.3 sources, 1.2, 1.3 liblayout-0.2.9-depends.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	.cvsignore liblayout.spec sources 
Removed Files:
	liblayout-0.2.9-depends.patch 
Log Message:
Post-release tuned for OpenOffice.org


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liblayout/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Sep 2008 20:32:50 -0000	1.2
+++ .cvsignore	16 Mar 2009 12:06:21 -0000	1.3
@@ -1 +1 @@
-liblayout-0.2.9.tar.gz
+liblayout-0.2.9-OOo31.zip


Index: liblayout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liblayout/devel/liblayout.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- liblayout.spec	25 Feb 2009 16:02:28 -0000	1.2
+++ liblayout.spec	16 Mar 2009 12:06:21 -0000	1.3
@@ -3,18 +3,18 @@
 
 Name: liblayout
 Version: 0.2.9
-Release: 2%{?dist}
+Release: 3.OOo31%{?dist}
 Summary: CSS based layouting framework
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/jfreereport/liblayout-%{version}-OOo31.zip
 URL: http://reporting.pentaho.org/
-BuildRequires: ant, java-devel, jpackage-utils, jcommon, flute, libloader
-BuildRequires: librepository, pentaho-libxml, libfonts, sac
+BuildRequires: ant, java-devel, jpackage-utils, flute, libloader, xml-commons-apis
+BuildRequires: librepository, pentaho-libxml, libfonts, sac, libbase >= 1.0.0
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, jcommon, flute, libloader >= 0.3.7
+Requires: java, jpackage-utils, flute, libloader >= 0.3.7
 Requires: librepository >= 0.1.6, libfonts >= 0.3.4, sac, xml-commons-apis
-Requires: pentaho-libxml
+Requires: pentaho-libxml, libbase >= 1.0.0
 %if %{with_gcj}
 BuildRequires: java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
@@ -22,7 +22,6 @@
 %else
 BuildArch: noarch
 %endif
-Patch1: liblayout-0.2.9-depends.patch
 
 %description
 LibLayout is a layouting framework. It is based on the Cascading StyleSheets
@@ -39,13 +38,14 @@
 Javadoc for %{name}.
 
 %prep
-%setup -q
-%patch1 -p1 -b .depends
+%setup -q -c
 find . -name "*.jar" -exec rm -f {} \;
-build-jar-repository -s -p lib jcommon flute libloader librepository libxml libfonts sac jaxp
+mkdir -p lib
+build-jar-repository -s -p lib flute libloader librepository libxml libfonts \
+    sac jaxp libbase commons-logging-api
 
 %build
-ant compile javadoc
+ant jar javadoc
 for file in README.txt licence-LGPL.txt ChangeLog.txt; do
     tr -d '\r' < $file > $file.new
     mv $file.new $file
@@ -55,10 +55,10 @@
 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
@@ -95,6 +95,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Mar 16 2009 Caolan McNamara <caolanm at redhat.com> 0.2.9-3.OOo31
+- Post-release tuned for OpenOffice.org
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liblayout/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Sep 2008 20:32:50 -0000	1.2
+++ sources	16 Mar 2009 12:06:21 -0000	1.3
@@ -1 +1 @@
-94e31e264321b74442d68cdc9f46bf19  liblayout-0.2.9.tar.gz
+283ad2d721f334555f62ce798e129c4d  liblayout-0.2.9-OOo31.zip


--- liblayout-0.2.9-depends.patch DELETED ---