rpms/libfonts/devel .cvsignore, 1.3, 1.4 libfonts.spec, 1.3, 1.4 sources, 1.3, 1.4 libfonts-0.4.0-builddepends.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	.cvsignore libfonts.spec sources 
Removed Files:
	libfonts-0.4.0-builddepends.patch 
Log Message:
Post-release tuned for OpenOffice.org


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libfonts/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Mar 2009 13:14:09 -0000	1.3
+++ .cvsignore	16 Mar 2009 11:54:07 -0000	1.4
@@ -1 +1 @@
-libfonts-0.4.0.tar.gz
+libfonts-1.0.0-OOo31.zip


Index: libfonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfonts/devel/libfonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libfonts.spec	9 Mar 2009 13:14:09 -0000	1.3
+++ libfonts.spec	16 Mar 2009 11:54:08 -0000	1.4
@@ -2,16 +2,16 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: libfonts
-Version: 0.4.0
-Release: 1%{?dist}
+Version: 1.0.0
+Release: 1.OOo31%{?dist}
 Summary: TrueType Font Layouting
 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, jcommon, libloader >= 0.3.7-1, itext
+BuildRequires: ant, java-devel, jpackage-utils, libloader >= 0.3.7-1, itext
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, jcommon, libloader >= 0.3.7-1, itext
+Requires: java, jpackage-utils, libloader >= 0.3.7-1, itext
 %if %{with_gcj}
 BuildRequires: java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
@@ -20,8 +20,6 @@
 BuildArch: noarch
 %endif
 
-Patch0: libfonts-0.4.0-builddepends.patch
-
 %description
 LibFonts is a library developed to support advanced layouting in JFreeReport.
 This library allows to read TrueType-Font files to extract layouting specific
@@ -37,13 +35,13 @@
 Javadoc for %{name}.
 
 %prep
-%setup -q
-%patch0 -p1 -b .builddepends
+%setup -q -c
 find . -name "*.jar" -exec rm -f {} \;
+mkdir -p lib
 build-jar-repository -s -p lib libbase commons-logging-api libloader itext
 
 %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
@@ -53,10 +51,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
@@ -93,6 +91,9 @@
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Mar 16 2009 Caolan McNamara <caolanm at redhat.com> 1.0.0-1.OOo31
+- Post-release tuned for OpenOffice.org
+
 * Mon Mar 09 2009 Caolan McNamara <caolanm at redhat.com> 0.4.0-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libfonts/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Mar 2009 13:14:09 -0000	1.3
+++ sources	16 Mar 2009 11:54:08 -0000	1.4
@@ -1 +1 @@
-e7ffdf8d43f45d22c2854575b0f1e6a8  libfonts-0.4.0.tar.gz
+3be770657f9c84cb72b63f400bb4543e  libfonts-1.0.0-OOo31.zip


--- libfonts-0.4.0-builddepends.patch DELETED ---