Hello community, here is the log from the commit of package velocity for openSUSE:Leap:15.2 checked in at 2020-02-05 07:29:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/velocity (Old) and /work/SRC/openSUSE:Leap:15.2/.velocity.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "velocity" Wed Feb 5 07:29:09 2020 rev:9 rq:764573 version:1.7 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/velocity/velocity.changes 2020-01-15 16:27:57.876737940 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.velocity.new.26092/velocity.changes 2020-02-05 07:29:12.286741287 +0100 @@ -1,0 +2,21 @@ +Tue Oct 1 11:35:09 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Build against the compatibility package log4j12 + +------------------------------------------------------------------- +Mon Apr 8 11:39:35 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Do not depend on the apache-parent, since we are not building + using Maven. + +------------------------------------------------------------------- +Thu Feb 14 08:35:38 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Build against the new plexus-classworlds package + +------------------------------------------------------------------- +Mon Nov 5 22:15:24 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Add alias "velocity:velocity" to the maven artifact + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ velocity.spec ++++++ --- /var/tmp/diff_new_pack.jwpPrM/_old 2020-02-05 07:29:12.834741518 +0100 +++ /var/tmp/diff_new_pack.jwpPrM/_new 2020-02-05 07:29:12.838741520 +0100 @@ -1,7 +1,7 @@ # # spec file for package velocity # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,26 +22,25 @@ Summary: Java-based template engine License: Apache-2.0 Group: Development/Libraries/Java -Url: http://velocity.apache.org/ -Source0: http://www.apache.org/dist/velocity/engine/1.7/%{name}-%{version}.tar.gz +URL: http://velocity.apache.org/ +Source0: http://www.apache.org/dist/velocity/engine/%{version}/%{name}-%{version}.tar.gz Source1: %{name}-%{version}.pom Patch0: velocity-build_xml.patch BuildRequires: ant >= 1.6.5 BuildRequires: ant-junit BuildRequires: antlr BuildRequires: avalon-logkit -BuildRequires: classworlds BuildRequires: commons-collections BuildRequires: commons-lang BuildRequires: commons-logging BuildRequires: fdupes BuildRequires: hsqldb BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: jdom >= 1.0-1 BuildRequires: junit -BuildRequires: log4j >= 1.1 +BuildRequires: log4j12 >= 1.1 BuildRequires: oro +BuildRequires: plexus-classworlds BuildRequires: servletapi4 BuildRequires: werken-xpath Requires: avalon-logkit @@ -49,7 +48,7 @@ Requires: commons-lang Requires: java >= 1.6.0 Requires: jdom >= 1.0-1 -Requires: log4j >= 1.1 +Requires: log4j12 >= 1.1 Requires: oro Requires: servletapi4 Requires: werken-xpath @@ -162,7 +161,10 @@ mv $j $j.no done %patch0 -b .sav0 -#%patch99 -b .sav99 + +cp %{SOURCE1} pom.xml + +%pom_remove_parent pom.xml %build #export JAVA_HOME=%{_jvmdir}/java-1.5.0 @@ -181,11 +183,12 @@ ln -sf $(build-classpath commons-lang) ln -sf $(build-classpath commons-logging) ln -sf $(build-classpath jdom) -ln -sf $(build-classpath log4j) +ln -sf $(build-classpath log4j12/log4j-12) ln -sf $(build-classpath oro) +# Use servletapi4 instead of servletapi5 in CLASSPATH ln -sf $(build-classpath servletapi4) ln -sf $(build-classpath werken-xpath) -ln -sf $(build-classpath classworlds) +ln -sf $(build-classpath plexus/classworlds) popd export CLASSPATH=$(build-classpath jdom commons-collections commons-lang werken-xpath antlr) CLASSPATH=$CLASSPATH:$(pwd)/test/texen-classpath/test.jar @@ -195,7 +198,7 @@ ant \ -Djavac.source=1.6 -Djavac.target=1.6 \ -buildfile build/build.xml \ - jar javadocs #test + jar javadocs %install # jars @@ -203,24 +206,27 @@ install -p -m 644 bin/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 %{SOURCE1} \ +install -pm 644 pom.xml \ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap +%add_maven_depmap -a velocity:velocity # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir} + rm -rf docs/api + +# zero-length file +rm -r test/issues/velocity-537/compare/velocity537.vm.cmp # data install -d -m 755 %{buildroot}%{_datadir}/%{name} cp -pr examples test %{buildroot}%{_datadir}/%{name} -%fdupes -s %{buildroot} +%fdupes -s %{buildroot}%{_datadir}/%{name} -%files -%doc LICENSE NOTICE README.txt -%{_javadir}/*.jar -%{_mavenpomdir}/* -%{_datadir}/maven-metadata/%{name}.xml +%files -f .mfiles +%license LICENSE NOTICE +%doc README.txt %files manual %doc docs/*
