Hello community, here is the log from the commit of package velocity for openSUSE:Factory checked in at 2019-03-04 09:21:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/velocity (Old) and /work/SRC/openSUSE:Factory/.velocity.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "velocity" Mon Mar 4 09:21:48 2019 rev:21 rq:680352 version:1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/velocity/velocity.changes 2018-12-04 20:56:26.164712257 +0100 +++ /work/SRC/openSUSE:Factory/.velocity.new.28833/velocity.changes 2019-03-04 09:21:51.184585025 +0100 @@ -1,0 +2,5 @@ +Thu Feb 14 08:35:38 UTC 2019 - Fridrich Strba <[email protected]> + +- Build against the new plexus-classworlds package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ velocity.spec ++++++ --- /var/tmp/diff_new_pack.os36eo/_old 2019-03-04 09:21:51.912584894 +0100 +++ /var/tmp/diff_new_pack.os36eo/_new 2019-03-04 09:21:51.912584894 +0100 @@ -1,7 +1,7 @@ # # spec file for package velocity # -# Copyright (c) 2018 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 @@ -22,28 +22,29 @@ 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: apache-parent 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: oro +BuildRequires: plexus-classworlds BuildRequires: servletapi4 BuildRequires: werken-xpath +Requires: apache-parent Requires: avalon-logkit Requires: commons-collections Requires: commons-lang @@ -162,7 +163,6 @@ mv $j $j.no done %patch0 -b .sav0 -#%patch99 -b .sav99 %build #export JAVA_HOME=%{_jvmdir}/java-1.5.0 @@ -183,9 +183,10 @@ ln -sf $(build-classpath jdom) ln -sf $(build-classpath log4j) 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 +196,7 @@ ant \ -Djavac.source=1.6 -Djavac.target=1.6 \ -buildfile build/build.xml \ - jar javadocs #test + jar javadocs %install # jars @@ -210,17 +211,20 @@ # 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/*
