Hello community, here is the log from the commit of package dom4j for openSUSE:Factory checked in at 2014-07-16 16:49:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dom4j (Old) and /work/SRC/openSUSE:Factory/.dom4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dom4j" Changes: -------- --- /work/SRC/openSUSE:Factory/dom4j/dom4j.changes 2013-09-11 13:39:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dom4j.new/dom4j.changes 2014-07-16 16:49:48.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:43:35 UTC 2014 - [email protected] + +- Do not depend on ant-trax and run spec-cleaner. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dom4j.spec ++++++ --- /var/tmp/diff_new_pack.OoO2aU/_old 2014-07-16 16:49:49.000000000 +0200 +++ /var/tmp/diff_new_pack.OoO2aU/_new 2014-07-16 16:49:49.000000000 +0200 @@ -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 @@ 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: 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: 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 @@ 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 @@ 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 @@ 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 @@ -171,29 +164,29 @@ %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) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
