diff --git a/README.md b/README.md index 75487c3..3fab9b0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # java-pentaho-libxml LibXML is a namespace aware SAX-Parser utility library. It eases the pain of implementing non-trivial SAX input handlers. The original code of these classes had been written by Peter Becker for the JCommon library. - LibXML replaces the JCommon-XML classes, which were not namespace aware. Due to JCommons frozen API, namespace awareness could not be added to the original code without creating a mess. diff --git a/java-jfree-libxml-1.1.3-build_properties.patch b/java-jfree-libxml-1.1.3-build_properties.patch deleted file mode 100644 index 0e16d5b..0000000 --- a/java-jfree-libxml-1.1.3-build_properties.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- build.properties 2009-11-16 10:27:58.000000000 +0100 -+++ build.properties-gil 2011-01-22 14:49:56.000000000 +0100 -@@ -1,4 +1,4 @@ --project.revision=TRUNK-SNAPSHOT -+project.revision=1.1.3 - ivy.artifact.group=pentaho-library - ivy.artifact.id=libxml - impl.title=LibXml -@@ -6,4 +6,6 @@ - src.dir=${basedir}/source - dependency.libbase.revision=1.1.3 - dependency.libloader.revision=1.1.3 --testsrc.dir=${basedir}/test -\ Manca newline alla fine del file -+testsrc.dir=${basedir}/test -+antcontrib.available=true -+build.cache.dir=lib -\ Manca newline alla fine del file diff --git a/java-pentaho-libxml.spec b/java-pentaho-libxml.spec index 8bcbfa5..b935530 100644 --- a/java-pentaho-libxml.spec +++ b/java-pentaho-libxml.spec @@ -1,115 +1,57 @@ -%define with_gcj 1 %define javahome %{_jvmdir}/jdk Name: java-pentaho-libxml Version: 1.1.3 -Release: 1mamba +Release: 2mamba Summary: LibXML is a namespace aware SAX-Parser utility library Group: Development/Libraries/Java Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://reporting.pentaho.org/ -# http://sourceforge.net/projects/jfreereport/ -# cvs -d:pserver:anonymous@jfreereport.cvs.sourceforge.net:/cvsroot/jfreereport login -# cvs -z3 -d:pserver:anonymous@jfreereport.cvs.sourceforge.net:/cvsroot/jfreereport co -P libxml -Source0: http://sourceforge.net/projects/jfreereport/files/02.%20Libraries/1.1.3-stable/libxml-1.1.3.zip -Patch0: java-jfree-libxml-1.1.3-build_properties.patch +URL: https://sourceforge.net/projects/jfreereport/ +Source0: http://sourceforge.net/projects/jfreereport/files/02.%20Libraries/%{version}-stable/libxml-%{version}.zip License: LGPL ## AUTOBUILDREQ-BEGIN -BuildRequires: glibc-devel -BuildRequires: java-gcj-compat -BuildRequires: libgcc -BuildRequires: libgcj4-devel -BuildRequires: libz-devel ## AUTOBUILDREQ-END -BuildRequires: ant-contribb3 -BuildRequires: java-jfree-libloader -BuildRequires: java-jfree-libbase -BuildRequires: jakarta-commons-logging -BuildRequires: apache-ant -BuildRequires: java-junit3 -BuildRequires: jpackage-utils -Requires: java-jfree-libbase -Requires: java-jfree-libloader -Requires: jpackage-utils -Obsoletes: java-jfree-libxml +BuildRequires: javapackages +Requires: javapackages +Provides: java-jfree-libbase +Obsoletes: java-jfree-libbase <= 1.1.3-1mamba +Provides: java-jfree-libloader +Obsoletes: java-jfree-libloader <= 1.1.3-1mamba Provides: java-jfree-libxml -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: java-jfree-libxml <= 1.1.3-1mamba +Provides: java-jfree-libpixie +Obsoletes: java-jfree-libpixie <= 1.1.3-1mamba %description LibXML is a namespace aware SAX-Parser utility library. It eases the pain of implementing non-trivial SAX input handlers. The original code of these classes had been written by Peter Becker for the JCommon library. - LibXML replaces the JCommon-XML classes, which were not namespace aware. Due to JCommons frozen API, namespace awareness could not be added to the original code without creating a mess. -%if %with_gcj -%package gcj -Group: System/Libraries/Java -Summary: GCJ support for %{name} -Requires: java-gcj-compat - -%description gcj -LibXML is a namespace aware SAX-Parser utility library. - -This package contains GCJ support for %{name}. -%endif - %package javadoc Group: Documentation Summary: Javadoc for %{name} %description javadoc LibXML is a namespace aware SAX-Parser utility library. - This package contains documentation for %{name}. %prep - -%setup -q -c -n libxml -%patch0 -for j in $(find . -name "*.jar"); do - rm -rf $j -done - -for txt in ChangeLog.txt licence-LGPL.txt README.txt; do - %{__perl} -pi -e 's/\r$//g' $txt -done - -mkdir -p lib/ant-contrib -ln -sf $(build-classpath libbase) lib/libbase.jar -%if "%{stage1}" != "1" -ln -sf $(build-classpath libloader) lib/libloader.jar -%endif -ln -sf $(build-classpath junit-3.8.2) lib/junit.jar -ln -sf $(build-classpath commons-logging-api) lib/ - -ln -s %{_javadir}/ant/* lib/ant-contrib +%setup -q -c %build -export CLASSPATH=$(build-classpath ant-contribb3 libbase junit-3.8.2 libloader commons-logging-api) -ant \ - jar javadoc %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" mkdir -p %{buildroot}%{_javadir} +install -pm 644 libxml-%{version}.jar %{buildroot}%{_javadir}/libxml-%{version}.jar +ln -sf libxml-%{version}.jar %{buildroot}%{_javadir}/libxml.jar -install -pm 644 dist/libxml-%{version}.jar %{buildroot}%{_javadir}/libxml-%{version}.jar - -( - cd %{buildroot}%{_javadir} - for jar in *-%{version}*; do - ln -sf ${jar} ${jar/-%{version}/} - done -) - -mkdir -p %{buildroot}%{_javadocdir}/libxml -cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/libxml - -%if %with_gcj -%{_bindir}/aot-compile-rpm -%endif +for f in libbase libloader libpixie; do + install -pm 644 lib/${f}-%{version}.jar %{buildroot}%{_javadir}/${f}-%{version}.jar + ln -sf ${f}-%{version}.jar %{buildroot}%{_javadir}/${f}.jar +done %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -118,30 +60,18 @@ cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/libxml %defattr(-,root,root) %{_javadir}/libxml-%{version}.jar %{_javadir}/libxml.jar -%doc ChangeLog.txt licence-LGPL.txt README.txt - -%if %with_gcj -%post gcj -if [ -x %{_bindir}/rebuild-gcj-db ] ; then - %{_bindir}/rebuild-gcj-db -fi - -%postun gcj -if [ -x %{_bindir}/rebuild-gcj-db ] ; then - %{_bindir}/rebuild-gcj-db -fi - -%files gcj -%defattr(-,root,root) -%{_libdir}/gcj/java-pentaho-libxml/libxml-%{version}.jar.db -%{_libdir}/gcj/java-pentaho-libxml/libxml-%{version}.jar.so -%endif - -%files javadoc -%defattr(-,root,root) -%{_javadocdir}/libxml +%{_javadir}/libbase-%{version}.jar +%{_javadir}/libbase.jar +%{_javadir}/libloader-%{version}.jar +%{_javadir}/libloader.jar +%{_javadir}/libpixie-%{version}.jar +%{_javadir}/libpixie.jar +%doc licence-LGPL.txt %changelog +* Thu Dec 02 2021 Silvan Calarco 1.1.3-2mamba +- restored + * Sat Jan 22 2011 gil 1.1.3-1mamba - update to 1.1.3