Hello community,
here is the log from the commit of package jakarta-commons-compress for
openSUSE:Factory checked in at 2017-05-22 10:47:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-compress (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-compress.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-compress"
Mon May 22 10:47:48 2017 rev:14 rq:496806 version:1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-commons-compress/jakarta-commons-compress.changes
2012-11-30 12:25:55.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-compress.new/jakarta-commons-compress.changes
2017-05-22 10:48:51.017355398 +0200
@@ -1,0 +2,5 @@
+Fri May 19 16:04:30 UTC 2017 - tchva...@suse.com
+
+- Fix build under new javapackage-tools
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-compress.spec ++++++
--- /var/tmp/diff_new_pack.eNsJ6C/_old 2017-05-22 10:48:51.581275916 +0200
+++ /var/tmp/diff_new_pack.eNsJ6C/_new 2017-05-22 10:48:51.581275916 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-compress
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,8 @@
#
-%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-%define _without_maven 1
-%bcond_with maven
-%define section free
%define base_name commons-compress
%define svnrev 701433
-
Name: jakarta-commons-compress
Version: 1.0
Release: 0
@@ -46,97 +38,34 @@
BuildRequires: ant >= 1.6
BuildRequires: jakarta-commons-io
BuildRequires: junit
-%if %with maven
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven2
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-site
-BuildRequires: saxon
-BuildRequires: saxon-scripts
-%endif
+Obsoletes: %{name}-javadoc
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Commons Compress is a component that contains Tar, Zip and BZip2
packages.
-
-
-%package javadoc
-Summary: Commons Compress
-Group: Development/Libraries/Java
-
-%description javadoc
-Commons Compress is a component that contains Tar, Zip and BZip2
-packages.
-
-
-
%prep
%setup -q -n %{base_name}-%{version}-%{svnrev}
cp -p %{SOURCE5} .
cp -p %{SOURCE6} build.xml
-%if %with maven
-export DEPCAT=$(pwd)/commons-compress-0.1-depcat.new.xml
-echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
-echo '<depset>' >> $DEPCAT
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- %{_bindir}/saxon project.xml %{SOURCE1} >> $DEPCAT
- popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $DEPCAT
-%{_bindir}/saxon $DEPCAT %{SOURCE2} > commons-compress-0.1-depmap.new.xml
-%endif
-%patch0 -p0
+%patch0
%build
-%if %with maven
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- cp project.xml project.xml.orig
- %{_bindir}/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
- popd
-done
-maven -e \
- -Dmaven.repo.remote=file:/usr/share/maven/repository \
- -Dmaven.javadoc.source=1.4 \
- -Dmaven.test.failure.ignore=true \
- -Dmaven.home.local=$(pwd)/.maven \
- jar javadoc
-%else
export CLASSPATH=$(build-classpath
commons-io):`pwd`/target/classes:`pwd`/target/test-classes
export OPT_JAR_LIST=:
ant \
-Djunit.jar=file://$(build-classpath junit) \
-Dbuild.sysclasspath=only \
-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
- jar javadoc
-%endif
+ jar
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/commons-compress-0.1-dev.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in jakarta-*; do ln -sf ${jar}
${jar/jakarta-/}; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
${jar/-%{version}/}; done)
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}
-ln -s %{name} $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}
-# FIXME: (dwalluck): breaks --short-circuit
-rm -rf target/docs/apidocs
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 target/commons-compress-0.1-dev.jar
%{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in jakarta-*; do ln -sf ${jar}
${jar/jakarta-/}; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
${jar/-%{version}/}; done)
%files
%defattr(0644,root,root,0755)
@@ -146,11 +75,4 @@
%{_javadir}/%{base_name}-%{version}.jar
%{_javadir}/%{base_name}.jar
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
-%{_javadocdir}/%{base_name}-%{version}
-%{_javadocdir}/%{base_name}
-
%changelog
++++++ commons-compress-0.1-build.xml ++++++
--- /var/tmp/diff_new_pack.eNsJ6C/_old 2017-05-22 10:48:51.609271970 +0200
+++ /var/tmp/diff_new_pack.eNsJ6C/_new 2017-05-22 10:48:51.609271970 +0200
@@ -59,7 +59,7 @@
</fileset>
</copy>
</target>
- <target name="jar" description="o Create the jar" depends="compile,test">
+ <target name="jar" description="o Create the jar" depends="compile">
<jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}"></jar>
</target>
<target name="clean" description="o Clean up the generated directories">
