From 1be0b6dbb8eece55109b5d3e01ac4fa4e80d68a896c90d344a933d3e57677bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 8 Jul 2014 10:43:45 +0000 Subject: [PATCH] - Do not depend on ant-trax and run spec-cleaner. OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=11 --- dom4j.changes | 5 ++++ dom4j.spec | 75 +++++++++++++++++++++++---------------------------- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/dom4j.changes b/dom4j.changes index 480b1e2..c5fb89f 100644 --- a/dom4j.changes +++ b/dom4j.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 8 10:43:35 UTC 2014 - tchvatal@suse.com + +- Do not depend on ant-trax and run spec-cleaner. + ------------------------------------------------------------------- Mon Sep 9 11:05:39 UTC 2013 - tchvatal@suse.com diff --git a/dom4j.spec b/dom4j.spec index a2c15a1..d45b0e0 100644 --- a/dom4j.spec +++ b/dom4j.spec @@ -1,7 +1,7 @@ # # spec file for package dom4j # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,7 +38,6 @@ Patch0: dom4j-1.6.1-bug1618750.patch BuildRequires: ant >= 1.6.5 BuildRequires: ant-apache-resolver BuildRequires: ant-junit -BuildRequires: ant-trax BuildRequires: bea-stax BuildRequires: isorelax BuildRequires: java-devel >= 1.5.0 @@ -52,7 +51,6 @@ BuildRequires: stax_1_0_api BuildRequires: ws-jaxme BuildRequires: xalan-j2 >= 2.7 BuildRequires: xerces-j2 -#BuildRequires: jaxp = 1.2 BuildRequires: xpp2 BuildRequires: xpp3 Requires: bea-stax @@ -69,8 +67,8 @@ Requires: xpp3 #Requires: jaxp = 1.2 Requires(post): javapackages-tools Requires(postun): javapackages-tools -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description dom4j is an easy to use Open Source XML, XPath and XSLT framework for @@ -89,8 +87,6 @@ Java using the Java Collections Framework. dom4j allows you to read, write, navigate, create and modify XML documents. dom4j integrates with DOM, SAX and JAXP and is seamlessly integrated with full XPath support. - - %package manual Summary: JarJar of dom4j for JBoss Group: Development/Libraries/Java @@ -101,7 +97,6 @@ Java using the Java Collections Framework. dom4j allows you to read, write, navigate, create and modify XML documents. dom4j integrates with DOM, SAX and JAXP and is seamlessly integrated with full XPath support. - %package javadoc Summary: XML, XPath and XSLT library for Java Group: Development/Libraries/Java @@ -112,8 +107,6 @@ Java using the Java Collections Framework. dom4j allows you to read, write, navigate, create and modify XML documents. dom4j integrates with DOM, SAX and JAXP and is seamlessly integrated with full XPath support. - - %prep %setup -q -n %{name} # replace run.sh @@ -136,28 +129,28 @@ pushd lib ln -sf $(build-classpath xpp2) ln -sf $(build-classpath relaxngDatatype) pushd endorsed -#ln -sf $(build-classpath jaxp12) +#ln -sf $(build-classpath jaxp12) popd -ln -sf $(build-classpath jaxme/jaxmeapi) -#ln -sf $(build-classpath msv-xsdlib) -#ln -sf $(build-classpath msv-msv) -ln -sf $(build-classpath jaxen) -ln -sf $(build-classpath bea-stax-api) +ln -sf $(build-classpath jaxme/jaxmeapi) +#ln -sf $(build-classpath msv-xsdlib) +#ln -sf $(build-classpath msv-msv) +ln -sf $(build-classpath jaxen) +ln -sf $(build-classpath bea-stax-api) pushd test -ln -sf $(build-classpath bea-stax-ri) -ln -sf $(build-classpath junitperf) -ln -sf $(build-classpath junit) +ln -sf $(build-classpath bea-stax-ri) +ln -sf $(build-classpath junitperf) +ln -sf $(build-classpath junit) popd -ln -sf $(build-classpath xpp3) +ln -sf $(build-classpath xpp3) pushd tools -ln -sf $(build-classpath jaxme/jaxmexs) -ln -sf $(build-classpath xalan-j2) -ln -sf $(build-classpath xalan-j2-serializer) -ln -sf $(build-classpath jaxme/jaxmejs) -ln -sf $(build-classpath jtidy) -ln -sf $(build-classpath isorelax) -ln -sf $(build-classpath jaxme/jaxme2) -ln -sf $(build-classpath xerces-j2) +ln -sf $(build-classpath jaxme/jaxmexs) +ln -sf $(build-classpath xalan-j2) +ln -sf $(build-classpath xalan-j2-serializer) +ln -sf $(build-classpath jaxme/jaxmejs) +ln -sf $(build-classpath jtidy) +ln -sf $(build-classpath isorelax) +ln -sf $(build-classpath jaxme/jaxme2) +ln -sf $(build-classpath xerces-j2) popd popd @@ -171,29 +164,29 @@ ant package release-javadoc %install # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -cp -p build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -d -m 755 %{buildroot}%{_javadir} +install -d -m 755 %{buildroot}%{_datadir}/maven2/poms +cp -p build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) mkdir -p %{buildroot}/%{_mavenpomdir} -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom +install -m 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr build/doc/javadoc/* %{buildroot}%{_javadocdir}/%{name} # manual -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} rm -rf docs/apidocs -cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +cp -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version} # demo -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/classes/org/dom4j -cp -pr xml $RPM_BUILD_ROOT%{_datadir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/src -cp -pr src/samples $RPM_BUILD_ROOT%{_datadir}/%{name}/src +mkdir -p %{buildroot}%{_datadir}/%{name}/classes/org/dom4j +cp -pr xml %{buildroot}%{_datadir}/%{name} +mkdir -p %{buildroot}%{_datadir}/%{name}/src +cp -pr src/samples %{buildroot}%{_datadir}/%{name}/src #cp -pr build/classes/org/dom4j/samples $RPM_BUILD_ROOT%{_datadir}/%{name}/classes/org/dom4j -install -m 0755 run.sh $RPM_BUILD_ROOT%{_datadir}/%{name} +install -m 0755 run.sh %{buildroot}%{_datadir}/%{name} %files %defattr(0644,root,root,0755)