Accepting request 240337 from Java:packages

javapackages updates submission

OBS-URL: https://build.opensuse.org/request/show/240337
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dom4j?expand=0&rev=15
This commit is contained in:
Stephan Kulow 2014-07-16 14:49:38 +00:00 committed by Git OBS Bridge
commit 441b4ef4b8
2 changed files with 39 additions and 41 deletions

View File

@ -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 Mon Sep 9 11:05:39 UTC 2013 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package dom4j # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 >= 1.6.5
BuildRequires: ant-apache-resolver BuildRequires: ant-apache-resolver
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: ant-trax
BuildRequires: bea-stax BuildRequires: bea-stax
BuildRequires: isorelax BuildRequires: isorelax
BuildRequires: java-devel >= 1.5.0 BuildRequires: java-devel >= 1.5.0
@ -52,7 +51,6 @@ BuildRequires: stax_1_0_api
BuildRequires: ws-jaxme BuildRequires: ws-jaxme
BuildRequires: xalan-j2 >= 2.7 BuildRequires: xalan-j2 >= 2.7
BuildRequires: xerces-j2 BuildRequires: xerces-j2
#BuildRequires: jaxp = 1.2
BuildRequires: xpp2 BuildRequires: xpp2
BuildRequires: xpp3 BuildRequires: xpp3
Requires: bea-stax Requires: bea-stax
@ -69,8 +67,8 @@ Requires: xpp3
#Requires: jaxp = 1.2 #Requires: jaxp = 1.2
Requires(post): javapackages-tools Requires(post): javapackages-tools
Requires(postun): javapackages-tools Requires(postun): javapackages-tools
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description %description
dom4j is an easy to use Open Source XML, XPath and XSLT framework for 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 write, navigate, create and modify XML documents. dom4j integrates with
DOM, SAX and JAXP and is seamlessly integrated with full XPath support. DOM, SAX and JAXP and is seamlessly integrated with full XPath support.
%package manual %package manual
Summary: JarJar of dom4j for JBoss Summary: JarJar of dom4j for JBoss
Group: Development/Libraries/Java 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 write, navigate, create and modify XML documents. dom4j integrates with
DOM, SAX and JAXP and is seamlessly integrated with full XPath support. DOM, SAX and JAXP and is seamlessly integrated with full XPath support.
%package javadoc %package javadoc
Summary: XML, XPath and XSLT library for Java Summary: XML, XPath and XSLT library for Java
Group: Development/Libraries/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 write, navigate, create and modify XML documents. dom4j integrates with
DOM, SAX and JAXP and is seamlessly integrated with full XPath support. DOM, SAX and JAXP and is seamlessly integrated with full XPath support.
%prep %prep
%setup -q -n %{name} %setup -q -n %{name}
# replace run.sh # replace run.sh
@ -136,28 +129,28 @@ pushd lib
ln -sf $(build-classpath xpp2) ln -sf $(build-classpath xpp2)
ln -sf $(build-classpath relaxngDatatype) ln -sf $(build-classpath relaxngDatatype)
pushd endorsed pushd endorsed
#ln -sf $(build-classpath jaxp12) #ln -sf $(build-classpath jaxp12)
popd popd
ln -sf $(build-classpath jaxme/jaxmeapi) ln -sf $(build-classpath jaxme/jaxmeapi)
#ln -sf $(build-classpath msv-xsdlib) #ln -sf $(build-classpath msv-xsdlib)
#ln -sf $(build-classpath msv-msv) #ln -sf $(build-classpath msv-msv)
ln -sf $(build-classpath jaxen) ln -sf $(build-classpath jaxen)
ln -sf $(build-classpath bea-stax-api) ln -sf $(build-classpath bea-stax-api)
pushd test pushd test
ln -sf $(build-classpath bea-stax-ri) ln -sf $(build-classpath bea-stax-ri)
ln -sf $(build-classpath junitperf) ln -sf $(build-classpath junitperf)
ln -sf $(build-classpath junit) ln -sf $(build-classpath junit)
popd popd
ln -sf $(build-classpath xpp3) ln -sf $(build-classpath xpp3)
pushd tools pushd tools
ln -sf $(build-classpath jaxme/jaxmexs) ln -sf $(build-classpath jaxme/jaxmexs)
ln -sf $(build-classpath xalan-j2) ln -sf $(build-classpath xalan-j2)
ln -sf $(build-classpath xalan-j2-serializer) ln -sf $(build-classpath xalan-j2-serializer)
ln -sf $(build-classpath jaxme/jaxmejs) ln -sf $(build-classpath jaxme/jaxmejs)
ln -sf $(build-classpath jtidy) ln -sf $(build-classpath jtidy)
ln -sf $(build-classpath isorelax) ln -sf $(build-classpath isorelax)
ln -sf $(build-classpath jaxme/jaxme2) ln -sf $(build-classpath jaxme/jaxme2)
ln -sf $(build-classpath xerces-j2) ln -sf $(build-classpath xerces-j2)
popd popd
popd popd
@ -171,29 +164,29 @@ ant package release-javadoc
%install %install
# jars # jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -d -m 755 %{buildroot}%{_javadir}
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
cp -p build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar cp -p build/%{name}.jar %{buildroot}%{_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) (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
mkdir -p %{buildroot}/%{_mavenpomdir} 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 %add_maven_depmap
# javadoc # javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr build/doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}
# manual # manual
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
rm -rf docs/apidocs rm -rf docs/apidocs
cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
# demo # demo
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/classes/org/dom4j mkdir -p %{buildroot}%{_datadir}/%{name}/classes/org/dom4j
cp -pr xml $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pr xml %{buildroot}%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/src mkdir -p %{buildroot}%{_datadir}/%{name}/src
cp -pr src/samples $RPM_BUILD_ROOT%{_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 #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 %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)