Hello community,
here is the log from the commit of package apache-commons-jxpath for
openSUSE:Factory checked in at 2019-03-01 16:47:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-jxpath (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-jxpath.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-jxpath"
Fri Mar 1 16:47:44 2019 rev:8 rq:680042 version:1.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-commons-jxpath/apache-commons-jxpath.changes
2019-02-06 14:06:50.926655491 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-jxpath.new.28833/apache-commons-jxpath.changes
2019-03-01 16:47:47.137790886 +0100
@@ -1,0 +2,12 @@
+Thu Feb 28 07:24:19 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Sanitize dependencies
+- Build and distribute the javadoc too
+- Added patch:
+ * commons-jxpath-1.3-manifest.patch
+ - Add OSGi bundle entries
+- Modified patch:
+ * build.xml.patch
+ - Remove completely the get-deps target that we don't use
+
+-------------------------------------------------------------------
Old:
----
commons-jxpath.depmap
New:
----
commons-jxpath-1.3-manifest.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-jxpath.spec ++++++
--- /var/tmp/diff_new_pack.9IzIYC/_old 2019-03-01 16:47:47.877790606 +0100
+++ /var/tmp/diff_new_pack.9IzIYC/_new 2019-03-01 16:47:47.881790605 +0100
@@ -26,25 +26,22 @@
Group: Development/Libraries/Java
URL: http://commons.apache.org/%{base_name}/
Source0:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Source1: %{short_name}.depmap
Patch0: %{short_name}-mockrunner.patch
Patch1: build.xml.patch
+Patch2: %{short_name}-%{version}-manifest.patch
BuildRequires: ant
BuildRequires: apache-commons-beanutils
-BuildRequires: el_api >= 3.0
+BuildRequires: fdupes
+BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
BuildRequires: jdom
-BuildRequires: jsp
-BuildRequires: junit
-BuildRequires: servlet >= 3.0
-Requires: apache-commons-beanutils
-Requires: apache-commons-logging
+BuildRequires: tomcat-jsp-2_3-api
Requires: java >= 1.8
Requires: jdom >= 1.0
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}-%{release}
+Provides: %{short_name} = %{version}-%{release}
BuildArch: noarch
%description
@@ -52,52 +49,54 @@
JXPath applies XPath expressions to graphs of objects of all kinds:
JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.
+%package javadoc
+Summary: API documentation for %{name}
+Group: Documentation/HTML
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
%patch1
+%patch2 -p1
+
+%pom_remove_parent
%build
-export CLASSPATH=$(build-classpath \
- ant-launcher \
- plexus/ \
- junit \
- jdom \
- jsp \
- apache-commons-beanutils \
- target/commons-jxpath.jar \
- ):target/classes:target/test-classes
-ant -Dmaven.mode.offline=true jar \
+mkdir -p target/lib
+build-jar-repository -s target/lib commons-beanutils jdom
glassfish-servlet-api tomcat-jsp-2.3-api
+%{ant} \
-Dant.build.javac.source=8 -Dant.build.javac.target=8 \
- -lib %{_datadir}/java
+ -lib %{_javadir} \
+ jar javadoc
+
sed -i "s/@name@/%{short_name}/g" src/conf/MANIFEST.MF
+sed -i "s/@fragment@/%{base_name}/g" src/conf/MANIFEST.MF
sed -i "s/@version@/%{version}/g" src/conf/MANIFEST.MF
jar ufm target/%{short_name}.jar src/conf/MANIFEST.MF
%install
-install -Dpm 644 target/%{short_name}.jar
%{buildroot}%{_javadir}/%{name}-%{version}.jar
-pushd %{buildroot}%{_javadir}
-for jar in *-%{version}*; do
- ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
- ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
-popd # come back from javadir
-
+#jar
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 644 target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}/%{last_path_segment}/
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
-%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
+install -dm 0755 %{buildroot}%{_mavenpomdir}
+install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar -a org.apache.commons:%{short_name}
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}
+
+%files -f .mfiles
+%license LICENSE.txt
+%{_javadir}/%{short_name}.jar
-%files
-%defattr(0644,root,root,0755)
+%files javadoc
%license LICENSE.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
+%{_javadocdir}/%{name}
%changelog
++++++ build.xml.patch ++++++
--- /var/tmp/diff_new_pack.9IzIYC/_old 2019-03-01 16:47:47.905790595 +0100
+++ /var/tmp/diff_new_pack.9IzIYC/_new 2019-03-01 16:47:47.905790595 +0100
@@ -1,5 +1,14 @@
--- build.xml.orig 2011-01-27 02:16:32.000000000 -0700
+++ build.xml 2011-01-27 02:17:20.000000000 -0700
+@@ -30,7 +30,7 @@
+ </equals>
+ </condition>
+ </target>
+- <target name="compile" description="o Compile the code" depends="get-deps">
++ <target name="compile" description="o Compile the code">
+ <mkdir dir="${classesdir}">
+ </mkdir>
+ <javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
@@ -52,7 +52,7 @@
</fileset>
</copy>
@@ -9,3 +18,21 @@
<jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
</jar>
</target>
+@@ -157,7 +157,7 @@
+ </classpath>
+ </javadoc>
+ </target>
+- <target name="get-deps" unless="noget" depends="init">
++ <!-- <target name="get-deps" unless="noget" depends="init">
+ <get dest="${libdir}/xerces-2.4.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.4.0.jar";>
+ </get>
+ <get dest="${libdir}/servletapi-2.4.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.4.jar";>
+@@ -176,7 +176,7 @@
+ </get>
+ <get dest="${libdir}/mockrunner-jdk1.3-j2ee1.3-0.4.jar"
usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven2/com/mockrunner/mockrunner-jdk1.3-j2ee1.3/0.4/mockrunner-jdk1.3-j2ee1.3-0.4.jar";>
+ </get>
+- </target>
++ </target> -->
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${repo}/maven/maven-install-latest.jar">
+ </get>
++++++ commons-jxpath-1.3-manifest.patch ++++++
--- commons-jxpath-1.3-src/src/conf/MANIFEST.MF 2008-07-30 18:31:34.000000000
+0200
+++ commons-jxpath-1.3-src/src/conf/MANIFEST.MF 2019-02-28 08:35:31.900760859
+0100
@@ -1,8 +1,38 @@
Extension-Name: @name@
-Specification-Title: Jakarta Commons JXPath
+Specification-Title: Commons JXPath
Specification-Vendor: Apache Software Foundation
Specification-Version: 1.0
-Implementation-Title: org.apache.commons.jxpath
+Implementation-Title: org.apache.commons.@fragment@
Implementation-Vendor: Apache Software Foundation
Implementation-Version: @version@
+Bundle-Description: A Java-based implementation of XPath 1.0 that, in ad
+ dition to XML processing, can inspect/modify Java object graphs (the li
+ brary's explicit purpose) and even mixed Java/XML structures.
+Bundle-DocURL: http://commons.apache.org/jxpath/
+Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: Commons JXPath
+Bundle-SymbolicName: org.apache.commons.@fragment@
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: @[email protected]
+Export-Package:
org.apache.commons.@fragment@;version="@version@",org.apache.commo
+
ns.@[email protected];version="@version@",org.apache.commons.@[email protected];version=
+
"@version@",org.apache.commons.@[email protected];version="@version@",org.apache.common
+
s.@[email protected];version="@version@",org.apache.commons.@[email protected];v
+
ersion="@version@",org.apache.commons.@[email protected];version="@version@",org
+
.apache.commons.@[email protected];version="@version@",org.apache.comm
+
ons.@[email protected];version="@version@",org.apache.commons.@[email protected]
+
l.dynabeans;version="@version@",org.apache.commons.@[email protected];ve
+
rsion="@version@",org.apache.commons.@[email protected];version="@version@",org.a
+
pache.commons.@[email protected];version="@version@",org.apache.commons.@fragment@.
+
servlet;version="@version@",org.apache.commons.@[email protected];version="@version@",org.
+ apache.commons.@[email protected];version="@version@"
+Import-Package: org.apache.commons.beanutils;resolution:=optional,org.jd
+ om;resolution:=optional,org.jdom.input;resolution:=optional,org.w3c.dom
+ ;resolution:=optional,javax.servlet;resolution:=optional,javax.servlet.
+ http;resolution:=optional,javax.servlet.jsp;resolution:=optional,javax.
+ xml.parsers,javax.xml.transform,javax.xml.transform.dom
+Include-Resource: META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=LI
+ CENSE.txt
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
