Hello community,
here is the log from the commit of package jakarta-commons-vfs for
openSUSE:Factory checked in at 2019-03-05 12:26:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-vfs (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-vfs"
Tue Mar 5 12:26:10 2019 rev:19 rq:681619 version:1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/jakarta-commons-vfs/jakarta-commons-vfs.changes
2019-01-28 20:49:10.937858496 +0100
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-vfs.new.28833/jakarta-commons-vfs.changes
2019-03-05 12:26:13.968828809 +0100
@@ -1,0 +2,7 @@
+Fri Mar 1 20:27:10 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Install all three built jar files
+- Associate the right pom file with the corresponding artifacts
+- Remove unnecessary sources and simplify the ant build
+
+-------------------------------------------------------------------
Old:
----
build.xml
commons-build.tar.bz2
commons-vfs-1.0-jpp-depmap.xml
core-build.xml
core-maven-build.xml
examples-build.xml
examples-maven-build.xml
maven-build.xml
pom-maven2jpp-depcat.xsl
pom-maven2jpp-mapdeps.xsl
pom-maven2jpp-newdepmap.xsl
sandbox-build.xml
sandbox-maven-build.xml
New:
----
commons-vfs-1.0-build.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-vfs.spec ++++++
--- /var/tmp/diff_new_pack.oag9SF/_old 2019-03-05 12:26:14.924828981 +0100
+++ /var/tmp/diff_new_pack.oag9SF/_new 2019-03-05 12:26:14.924828981 +0100
@@ -26,19 +26,7 @@
URL: http://jakarta.apache.org/commons/vfs/
# svn export
http://svn.apache.org/repos/asf/jakarta/commons/proper/vfs/tags/vfs-1.0/
Source0: commons-vfs-1.0-src.tar.bz2
-Source1: pom-maven2jpp-depcat.xsl
-Source2: pom-maven2jpp-newdepmap.xsl
-Source3: pom-maven2jpp-mapdeps.xsl
-Source4: commons-vfs-1.0-jpp-depmap.xml
-Source5: commons-build.tar.bz2
-Source6: build.xml
-Source7: maven-build.xml
-Source8: core-build.xml
-Source9: core-maven-build.xml
-Source10: examples-build.xml
-Source11: examples-maven-build.xml
-Source12: sandbox-build.xml
-Source13: sandbox-maven-build.xml
+Source1: commons-vfs-1.0-build.tar.xz
Patch0: commons-vfs-1.0-project_properties.patch
Patch1: commons-vfs-1.0-jakarta-commons-httpclient-3.1.patch
BuildRequires: ant >= 1.6
@@ -107,18 +95,12 @@
different types.
%prep
-%setup -q -n vfs-%{version}
-%setup -q -T -D -a 5 -n vfs-%{version}
+%setup -q -n vfs-%{version} -a1
%patch0
%patch1 -p1
find . -name "*.jar" | xargs -t rm
-cp -p %{SOURCE6} %{SOURCE7} .
-cp -p %{SOURCE8} core/build.xml
-cp -p %{SOURCE9} core/maven-build.xml
-cp -p %{SOURCE10} examples/build.xml
-cp -p %{SOURCE11} examples/maven-build.xml
-cp -p %{SOURCE12} sandbox/build.xml
-cp -p %{SOURCE13} sandbox/maven-build.xml
+
+%pom_remove_parent core examples sandbox
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -140,14 +122,20 @@
%install
# jars
install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 target/%{base_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
-(cd %{buildroot}%{_javadir} && for jar in jakarta-*; do \
-ln -sf ${jar} ${jar/jakarta-/}; done)
-
+install -m 644 target/%{base_name}-%{version}*.jar
%{buildroot}%{_javadir}/%{base_name}.jar
+ln -sf %{base_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 target/%{base_name}-examples-%{version}*.jar
%{buildroot}%{_javadir}/%{base_name}-examples.jar
+ln -sf %{base_name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
+install -m 644 target/%{base_name}-sandbox-%{version}*.jar
%{buildroot}%{_javadir}/%{base_name}-sandbox.jar
+ln -sf %{base_name}-sandbox.jar %{buildroot}%{_javadir}/%{name}-sandbox.jar
#pom
mkdir -p %{buildroot}%{_mavenpomdir}
-install -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+install -m 0644 core/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom
+%add_maven_depmap %{base_name}.pom %{base_name}.jar
+install -m 0644 examples/pom.xml
%{buildroot}%{_mavenpomdir}/%{base_name}-examples.pom
+%add_maven_depmap %{base_name}-examples.pom %{base_name}-examples.jar
+install -m 0644 sandbox/pom.xml
%{buildroot}%{_mavenpomdir}/%{base_name}-sandbox.pom
+%add_maven_depmap %{base_name}-sandbox.pom %{base_name}-sandbox.jar
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
@@ -157,11 +145,9 @@
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
-%files
+%files -f .mfiles
%doc *.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_datadir}/maven-metadata/%{name}.xml*
+%{_javadir}/%{name}*.jar
%files manual
%{_docdir}/%{name}-%{version}
