rpms/libloader/devel .cvsignore, 1.3, 1.4 libloader.spec, 1.3, 1.4 sources, 1.3, 1.4

Caolan McNamara caolanm at fedoraproject.org
Mon Mar 16 11:17:19 UTC 2009


Author: caolanm

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

Modified Files:
	.cvsignore libloader.spec sources 
Log Message:
Post release tuned for OpenOffice.org reportbuilder


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libloader/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Mar 2009 11:00:25 -0000	1.3
+++ .cvsignore	16 Mar 2009 11:16:48 -0000	1.4
@@ -1 +1 @@
-libloader-0.4.0.tar.gz
+libloader-1.0.0-OOo31.zip


Index: libloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libloader/devel/libloader.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libloader.spec	9 Mar 2009 10:54:34 -0000	1.3
+++ libloader.spec	16 Mar 2009 11:16:49 -0000	1.4
@@ -2,12 +2,12 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: libloader
-Version: 0.4.0
-Release: 1%{?dist}
+Version: 1.0.0
+Release: 1.OOo31%{?dist}
 Summary: Resource Loading Framework
 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
 BuildRequires: libbase >= 1.0.0
@@ -20,7 +20,6 @@
 %else
 BuildArch: noarch
 %endif
-Patch1: libloader-0.4.0-builddepends.patch
 
 %description
 LibLoader is a general purpose resource loading framework. It has been
@@ -38,13 +37,13 @@
 Javadoc for %{name}.
 
 %prep
-%setup -q
+%setup -q -c
 find . -name "*.jar" -exec rm -f {} \;
+mkdir -p lib
 build-jar-repository -s -p lib libbase commons-logging-api
-%patch1 -p1 -b .builddepends.patch
 
 %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
@@ -54,10 +53,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
@@ -94,6 +93,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 reportbuilder
+
 * Mon Mar 09 2009 Caolan McNamara <caolanm at redhat.com> 0.4.0-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libloader/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Mar 2009 11:00:25 -0000	1.3
+++ sources	16 Mar 2009 11:16:49 -0000	1.4
@@ -1 +1 @@
-bfbd271ff87a8488e0295933f6ca0d8d  libloader-0.4.0.tar.gz
+d522a35d9608ace2dfa37419b1d1707d  libloader-1.0.0-OOo31.zip




More information about the fedora-extras-commits mailing list