rpms/libloader/devel libloader-1.1.2.build.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 libloader.spec, 1.5, 1.6 sources, 1.4, 1.5

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	.cvsignore libloader.spec sources 
Added Files:
	libloader-1.1.2.build.patch 
Log Message:
latest version

libloader-1.1.2.build.patch:
 build.properties |    6 ++++--
 common_build.xml |    4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE libloader-1.1.2.build.patch ---
--- libloader-1.1.2/build.properties	2009-11-17 14:12:00.000000000 +0000
+++ libloader-1.1.2/build.properties	2009-11-17 14:12:48.000000000 +0000
@@ -1,4 +1,4 @@
-project.revision=TRUNK-SNAPSHOT
+project.revision=1.1.2
 ivy.artifact.group=pentaho-library
 ivy.artifact.id=libloader
 impl.title=LibLoader
@@ -6,4 +6,6 @@
 src.dir=${basedir}/source
 dependency.libbase.revision=1.1.2
 dependency.libpixie.revision=1.1.2
-testsrc.dir=${basedir}/test
\ No newline at end of file
+testsrc.dir=${basedir}/test
+antcontrib.available=true
+build.cache.dir=lib
--- libloader-1.1.2/common_build.xml	2009-11-17 14:55:31.000000000 +0000
+++ libloader-1.1.2/common_build.xml	2009-11-17 14:56:48.000000000 +0000
@@ -1071,6 +1071,7 @@
         <path refid="classpath" />
       </classpath>
       <src path="${src.dir}" />
+      <exclude name="org/pentaho/reporting/libraries/resourceloader/modules/**"/>
     </javac>
   </target>
 
@@ -1356,6 +1357,9 @@
              doctitle="${impl.title} documentation">
       <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
       <classpath refid="classpath" />
+      <packageset dir="source">
+        <exclude name="org/pentaho/reporting/libraries/resourceloader/modules/**"/>
+      </packageset>
     </javadoc>
   </target>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libloader/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Mar 2009 11:16:48 -0000	1.4
+++ .cvsignore	17 Nov 2009 15:17:19 -0000	1.5
@@ -1 +1 @@
-libloader-1.0.0-OOo31.zip
+libloader-1.1.2.zip


Index: libloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libloader/devel/libloader.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libloader.spec	24 Jul 2009 09:40:08 -0000	1.5
+++ libloader.spec	17 Nov 2009 15:17:19 -0000	1.6
@@ -2,17 +2,17 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: libloader
-Version: 1.0.0
-Release: 2.OOo31%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 Summary: Resource Loading Framework
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}-OOo31.zip
+Source: http://downloads.sourceforge.net/jfreereport/%{name}-%{version}.zip
 URL: http://reporting.pentaho.org/
-BuildRequires: ant, java-devel, jpackage-utils
-BuildRequires: libbase >= 1.0.0
+BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils
+BuildRequires: libbase >= 1.1.2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: java, jpackage-utils, libbase >= 1.0.0
+Requires: java, jpackage-utils, libbase >= 1.1.2
 %if %{with_gcj}
 BuildRequires: java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
@@ -20,6 +20,7 @@ Requires(postun): java-gcj-compat >= 1.0
 %else
 BuildArch: noarch
 %endif
+Patch0: libloader-1.1.2.build.patch
 
 %description
 LibLoader is a general purpose resource loading framework. It has been
@@ -41,9 +42,12 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -c
+%patch0 -p1 -b .build
 find . -name "*.jar" -exec rm -f {} \;
 mkdir -p lib
 build-jar-repository -s -p lib libbase commons-logging-api
+cd lib
+ln -s %{_javadir}/ant ant-contrib
 
 %build
 ant jar javadoc
@@ -56,10 +60,13 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p ./dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -s %{name}-%{version}.jar %{name}.jar
+popd
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp build/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -86,7 +93,8 @@ fi
 %files
 %defattr(0644,root,root,0755)
 %doc licence-LGPL.txt README.txt ChangeLog.txt
-%{_javadir}/*.jar
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
 %if %{with_gcj}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
@@ -96,6 +104,9 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Nov 17 2009 Caolan McNamara <caolanm at redhat.com> 1.1.2
+- latest version
+
 * Fri Jul 24 2009 Caolan McNamara <caolanm at redhat.com> 1.0.0-2.OOo31
 - make javadoc no-arch when building as arch-dependant aot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libloader/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Mar 2009 11:16:49 -0000	1.4
+++ sources	17 Nov 2009 15:17:19 -0000	1.5
@@ -1 +1 @@
-d522a35d9608ace2dfa37419b1d1707d  libloader-1.0.0-OOo31.zip
+75bbd5cb221dace0c57417c9de273cc2  libloader-1.1.2.zip