diff --git a/.gitignore b/.gitignore index e69de29..9ac9412 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/libformula-1.1.3-jarsdeleted.zip diff --git a/libformula-1.1.2.build.patch b/libformula-1.1.2.build.patch new file mode 100644 index 0000000..a6bb952 --- /dev/null +++ b/libformula-1.1.2.build.patch @@ -0,0 +1,16 @@ +--- libformula-1.1.3/build.properties 2009-11-17 16:11:48.000000000 +0000 ++++ libformula-1.1.3/build.properties 2009-11-17 16:12:05.000000000 +0000 +@@ -1,8 +1,10 @@ +-project.revision=TRUNK-SNAPSHOT ++project.revision=1.1.3 + ivy.artifact.group=pentaho-library + ivy.artifact.id=libformula + impl.title=LibFormula + impl.productID=libformula + src.dir=${basedir}/source + dependency.libbase.revision=1.1.3 +-testsrc.dir=${basedir}/test +\ No newline at end of file ++testsrc.dir=${basedir}/test ++antcontrib.available=true ++build.cache.dir=lib diff --git a/libformula-1.1.2.java11.patch b/libformula-1.1.2.java11.patch new file mode 100644 index 0000000..ae0a009 --- /dev/null +++ b/libformula-1.1.2.java11.patch @@ -0,0 +1,13 @@ +--- libformula-1.1.3/common_build.xml 2020-05-05 19:51:29.901832133 +0100 ++++ libformula-1.1.3/common_build.xml 2020-05-05 19:51:35.875883155 +0100 +@@ -136,8 +136,8 @@ + +- +- ++ ++ + + + = 1.1.3 +Requires: java-headless, jpackage-utils, apache-commons-logging, libbase >= 1.1.3 +BuildArch: noarch +Patch0: libformula-1.1.2.build.patch +Patch1: libformula-1.1.2.java11.patch + +%description +LibFormula provides Excel-Style-Expressions. The implementation provided +here is very generic and can be used in any application that needs to +compute formulas. + +%package javadoc +Summary: Javadoc for %{name} +Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q -c +%patch0 -p1 -b .build +%patch1 -p1 -b .java11 +find . -name "*.jar" -exec rm -f {} \; +mkdir -p lib +build-jar-repository -s -p lib commons-logging-api libbase +cd lib +ln -s /usr/share/java/ant ant-contrib + +%build +ant jar javadoc + +%install +mkdir -p $RPM_BUILD_ROOT%{_javadir} +cp -p ./dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +%files +%doc licence-LGPL.txt README.txt ChangeLog.txt +%{_javadir}/%{name}.jar + +%files javadoc +%{_javadocdir}/%{name} + +%changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.1.3-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 1.1.3-25 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue May 05 2020 Caolán McNamara - 1.1.3-24 +- allow rebuild with java 11 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.1.3-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.1.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Apr 04 2019 Stephan Bergmann - 1.1.3-21 +- Use /usr/share/java instead of _javadir macro for build dependencies + +* Fri Feb 01 2019 Fedora Release Engineering - 1.1.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.1.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.1.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.1.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.1.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.1.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Feb 25 2014 Caolán McNamara - 1.1.3-12 +- Resolves: rhbz#1068354 Switch to java-headless (build)requires + +* Wed Oct 23 2013 Caolán McNamara - 1.1.3-11 +- Resolves: rhbz#1022132 remove versioned jars + +* Tue Aug 06 2013 Parag Nemade - 1.1.3-10 +- ant-nodeps is dropped from ant-1.9.0-2 build in rawhide +- Drop buildroot, %%clean, %%defattr and removal of buildroot in %%install + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Nov 03 2012 Caolán McNamara - 1.1.3-7 +- repack source to remove bundled multi-license .jars + +* Thu Jul 19 2012 Fedora Release Engineering - 1.1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 03 2012 Caolán McNamara 1.1.3-5 +- Resolves: rhbz#818494 adapt for jakarta->apache + +* Fri Jan 13 2012 Fedora Release Engineering - 1.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Oct 28 2011 Caolán McNamara 1.1.3-3 +- Related: rhbz#749103 drop gcj aot + +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 03 2009 Caolan McNamara 1.1.3-1 +- latest version + +* Tue Nov 17 2009 Caolan McNamara 1.1.2-1 +- latest version + +* Fri Jul 24 2009 Caolan McNamara 0.2.0-3.OOo31 +- make javadoc no-arch when building as arch-dependant aot + +* Mon Mar 16 2009 Caolan McNamara 0.2.0-2.OOo31 +- post-release tuned for OpenOffice.org report-designer + +* Mon Mar 09 2009 Caolan McNamara 0.2.0-1 +- latest version + +* Wed Feb 25 2009 Fedora Release Engineering - 0.1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed May 07 2008 Caolan McNamara 0.1.18-1 +- initial fedora import diff --git a/sources b/sources new file mode 100644 index 0000000..2c88efb --- /dev/null +++ b/sources @@ -0,0 +1 @@ +302dada45ae7b66b8ca738372cadd974 libformula-1.1.3-jarsdeleted.zip