commit velocity for openSUSE:Factory
Hello community, here is the log from the commit of package velocity for openSUSE:Factory checked in at 2019-10-04 11:21:32 Comparing /work/SRC/openSUSE:Factory/velocity (Old) and /work/SRC/openSUSE:Factory/.velocity.new.2352 (New) Package is "velocity" Fri Oct 4 11:21:32 2019 rev:23 rq:734274 version:1.7 Changes: --- /work/SRC/openSUSE:Factory/velocity/velocity.changes2019-04-11 12:19:55.237008725 +0200 +++ /work/SRC/openSUSE:Factory/.velocity.new.2352/velocity.changes 2019-10-04 11:22:27.752938688 +0200 @@ -1,0 +2,5 @@ +Tue Oct 1 11:35:09 UTC 2019 - Fridrich Strba + +- Build against the compatibility package log4j12 + +--- Other differences: -- ++ velocity.spec ++ --- /var/tmp/diff_new_pack.rYFL6t/_old 2019-10-04 11:22:28.212937489 +0200 +++ /var/tmp/diff_new_pack.rYFL6t/_new 2019-10-04 11:22:28.212937489 +0200 @@ -38,7 +38,7 @@ BuildRequires: javapackages-local BuildRequires: jdom >= 1.0-1 BuildRequires: junit -BuildRequires: log4j >= 1.1 +BuildRequires: log4j12 >= 1.1 BuildRequires: oro BuildRequires: plexus-classworlds BuildRequires: servletapi4 @@ -48,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 @@ -183,7 +183,7 @@ 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)
commit velocity for openSUSE:Factory
Hello community,
here is the log from the commit of package velocity for openSUSE:Factory
checked in at 2019-04-11 12:19:53
Comparing /work/SRC/openSUSE:Factory/velocity (Old)
and /work/SRC/openSUSE:Factory/.velocity.new.27019 (New)
Package is "velocity"
Thu Apr 11 12:19:53 2019 rev:22 rq:693104 version:1.7
Changes:
--- /work/SRC/openSUSE:Factory/velocity/velocity.changes2019-03-04
09:21:51.184585025 +0100
+++ /work/SRC/openSUSE:Factory/.velocity.new.27019/velocity.changes
2019-04-11 12:19:55.237008725 +0200
@@ -1,0 +2,6 @@
+Mon Apr 8 11:39:35 UTC 2019 - Fridrich Strba
+
+- Do not depend on the apache-parent, since we are not building
+ using Maven.
+
+---
Other differences:
--
++ velocity.spec ++
--- /var/tmp/diff_new_pack.Uv26Rb/_old 2019-04-11 12:19:56.293009176 +0200
+++ /var/tmp/diff_new_pack.Uv26Rb/_new 2019-04-11 12:19:56.297009178 +0200
@@ -29,7 +29,6 @@
BuildRequires: ant >= 1.6.5
BuildRequires: ant-junit
BuildRequires: antlr
-BuildRequires: apache-parent
BuildRequires: avalon-logkit
BuildRequires: commons-collections
BuildRequires: commons-lang
@@ -44,7 +43,6 @@
BuildRequires: plexus-classworlds
BuildRequires: servletapi4
BuildRequires: werken-xpath
-Requires: apache-parent
Requires: avalon-logkit
Requires: commons-collections
Requires: commons-lang
@@ -164,6 +162,10 @@
done
%patch0 -b .sav0
+cp %{SOURCE1} pom.xml
+
+%pom_remove_parent pom.xml
+
%build
#export JAVA_HOME=%{_jvmdir}/java-1.5.0
# Use servletapi4 instead of servletapi5 in CLASSPATH
@@ -204,7 +206,7 @@
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 -a velocity:velocity
commit velocity for openSUSE:Factory
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.changes2018-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
+
+- 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/*
commit velocity for openSUSE:Factory
Hello community,
here is the log from the commit of package velocity for openSUSE:Factory
checked in at 2018-12-04 20:56:09
Comparing /work/SRC/openSUSE:Factory/velocity (Old)
and /work/SRC/openSUSE:Factory/.velocity.new.19453 (New)
Package is "velocity"
Tue Dec 4 20:56:09 2018 rev:20 rq:653653 version:1.7
Changes:
--- /work/SRC/openSUSE:Factory/velocity/velocity.changes2017-09-20
17:10:46.609722262 +0200
+++ /work/SRC/openSUSE:Factory/.velocity.new.19453/velocity.changes
2018-12-04 20:56:26.164712257 +0100
@@ -1,0 +2,5 @@
+Mon Nov 5 22:15:24 UTC 2018 - Fridrich Strba
+
+- Add alias "velocity:velocity" to the maven artifact
+
+---
Other differences:
--
++ velocity.spec ++
--- /var/tmp/diff_new_pack.5F7l7P/_old 2018-12-04 20:56:26.748711613 +0100
+++ /var/tmp/diff_new_pack.5F7l7P/_new 2018-12-04 20:56:26.748711613 +0100
@@ -1,7 +1,7 @@
#
# spec file for package velocity
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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/
#
@@ -205,7 +205,7 @@
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{SOURCE1} \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+%add_maven_depmap -a velocity:velocity
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
commit velocity for openSUSE:Factory
Hello community,
here is the log from the commit of package velocity for openSUSE:Factory
checked in at 2017-09-20 17:10:44
Comparing /work/SRC/openSUSE:Factory/velocity (Old)
and /work/SRC/openSUSE:Factory/.velocity.new (New)
Package is "velocity"
Wed Sep 20 17:10:44 2017 rev:19 rq:527245 version:1.7
Changes:
--- /work/SRC/openSUSE:Factory/velocity/velocity.changes2017-05-22
10:48:54.268897108 +0200
+++ /work/SRC/openSUSE:Factory/.velocity.new/velocity.changes 2017-09-20
17:10:46.609722262 +0200
@@ -1,0 +2,5 @@
+Tue Sep 19 08:36:49 UTC 2017 - fst...@suse.com
+
+- Fix buid with jdk9: specify java source and target level 1.6
+
+---
Other differences:
--
++ velocity.spec ++
--- /var/tmp/diff_new_pack.15LOMJ/_old 2017-09-20 17:10:48.121509449 +0200
+++ /var/tmp/diff_new_pack.15LOMJ/_new 2017-09-20 17:10:48.121509449 +0200
@@ -47,13 +47,12 @@
Requires: avalon-logkit
Requires: commons-collections
Requires: commons-lang
-Requires: java >= 1.5.0
+Requires: java >= 1.6.0
Requires: jdom >= 1.0-1
Requires: log4j >= 1.1
Requires: oro
Requires: servletapi4
Requires: werken-xpath
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -194,7 +193,7 @@
#FIXME: tests failed on CommonsExtPropTestCase
#but resulting files seems to be same
ant \
- -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+ -Djavac.source=1.6 -Djavac.target=1.6 \
-buildfile build/build.xml \
jar javadocs #test
@@ -218,22 +217,18 @@
%fdupes -s %{buildroot}
%files
-%defattr(0644,root,root,0755)
%doc LICENSE NOTICE README.txt
%{_javadir}/*.jar
%{_mavenpomdir}/*
%{_datadir}/maven-metadata/%{name}.xml
%files manual
-%defattr(0644,root,root,0755)
%doc docs/*
%files javadoc
-%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%files demo
-%defattr(0644,root,root,0755)
%{_datadir}/%{name}
%changelog
commit velocity for openSUSE:Factory
Hello community,
here is the log from the commit of package velocity for openSUSE:Factory
checked in at 2017-05-22 10:47:54
Comparing /work/SRC/openSUSE:Factory/velocity (Old)
and /work/SRC/openSUSE:Factory/.velocity.new (New)
Package is "velocity"
Mon May 22 10:47:54 2017 rev:18 rq:496818 version:1.7
Changes:
--- /work/SRC/openSUSE:Factory/velocity/velocity.changes2015-04-02
15:59:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.velocity.new/velocity.changes 2017-05-22
10:48:54.268897108 +0200
@@ -1,0 +2,10 @@
+Fri May 19 16:41:19 UTC 2017 - tchva...@suse.com
+
+- Remove unneeded deps
+
+---
+Fri May 19 09:23:26 UTC 2017 - dziolkow...@suse.com
+
+- New build dependency: javapackages-local
+
+---
Other differences:
--
++ velocity.spec ++
--- /var/tmp/diff_new_pack.T5Y2lx/_old 2017-05-22 10:48:55.796681774 +0200
+++ /var/tmp/diff_new_pack.T5Y2lx/_new 2017-05-22 10:48:55.800681209 +0200
@@ -1,7 +1,7 @@
#
# spec file for package velocity
#
-# Copyright (c) 2015 SUSE LINUX 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
@@ -22,21 +22,10 @@
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
Source1:%{name}-%{version}.pom
Patch0: velocity-build_xml.patch
-Url:http://velocity.apache.org/
-Requires: avalon-logkit
-Requires: commons-collections
-Requires: commons-lang
-Requires: java >= 1.5.0
-Requires: jdom >= 1.0-1
-Requires: log4j >= 1.1
-#Requires: jakarta-oro
-Requires: oro
-# Use servletapi4 instead of servletapi5
-Requires: servletapi4
-Requires: werken-xpath
BuildRequires: ant >= 1.6.5
BuildRequires: ant-junit
BuildRequires: antlr
@@ -45,20 +34,27 @@
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
-# Use servletapi4 instead of servletapi5
-BuildRequires: fdupes
BuildRequires: servletapi4
BuildRequires: werken-xpath
-Requires(post):javapackages-tools
-Requires(postun): javapackages-tools
-BuildArch: noarch
+Requires: avalon-logkit
+Requires: commons-collections
+Requires: commons-lang
+Requires: java >= 1.5.0
+Requires: jdom >= 1.0-1
+Requires: log4j >= 1.1
+Requires: oro
+Requires: servletapi4
+Requires: werken-xpath
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
Velocity is a Java-based template engine. It permits anyone to use the
@@ -109,9 +105,6 @@
%packagejavadoc
Summary:Javadoc for %{name}
Group: Documentation/HTML
-Requires(post): %{__rm}
-Requires(post): /bin/ln
-Requires(postun): %{__rm}
%descriptionjavadoc
Velocity is a Java-based template engine. It permits anyone to use the
@@ -161,7 +154,7 @@
applications to be developed according to a true MVC model.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q
# Remove all binary libs used in compiling the package.
# Note that velocity has some jar files containing macros under
# examples and test that should not be removed.
@@ -207,21 +200,21 @@
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 bin/%{name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 bin/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{SOURCE1} \
-$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
rm -rf docs/api
# data
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr examples test $RPM_BUILD_ROOT%{_datadir}/%{name}
commit velocity for openSUSE:Factory
Hello community,
here is the log from the commit of package velocity for openSUSE:Factory
checked in at 2015-04-02 15:59:11
Comparing /work/SRC/openSUSE:Factory/velocity (Old)
and /work/SRC/openSUSE:Factory/.velocity.new (New)
Package is velocity
Changes:
--- /work/SRC/openSUSE:Factory/velocity/velocity.changes2014-12-09
09:13:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.velocity.new/velocity.changes 2015-04-02
15:59:12.0 +0200
@@ -1,0 +2,5 @@
+Wed Mar 18 09:46:23 UTC 2015 - tchva...@suse.com
+
+- Fix build with new javapackages-tools
+
+---
Other differences:
--
++ velocity.spec ++
--- /var/tmp/diff_new_pack.MMQ4xy/_old 2015-04-02 15:59:12.0 +0200
+++ /var/tmp/diff_new_pack.MMQ4xy/_new 2015-04-02 15:59:12.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package velocity
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -229,7 +229,7 @@
%doc LICENSE NOTICE README.txt
%{_javadir}/*.jar
%{_mavenpomdir}/*
-%config %{_mavendepmapfragdir}
+%{_datadir}/maven-metadata/%{name}.xml
%files manual
%defattr(0644,root,root,0755)
commit velocity for openSUSE:Factory
Hello community,
here is the log from the commit of package velocity for openSUSE:Factory
checked in at 2014-12-09 09:14:15
Comparing /work/SRC/openSUSE:Factory/velocity (Old)
and /work/SRC/openSUSE:Factory/.velocity.new (New)
Package is velocity
Changes:
--- /work/SRC/openSUSE:Factory/velocity/velocity.changes2014-06-30
22:50:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.velocity.new/velocity.changes 2014-12-09
09:13:53.0 +0100
@@ -1,0 +2,9 @@
+Fri Dec 5 14:34:48 UTC 2014 - p.drou...@gmail.com
+
+- Update to version 1.7
+ + No changelog available
+- Add requirement to commons-logging; new dependency
+- Remove java-devel = 1.6.0 requirement; not needed anymore
+- Do not copy convert folder; doesn't exist anymore
+
+---
Old:
velocity-1.5.pom
velocity-1.5.tar.bz2
New:
velocity-1.7.pom
velocity-1.7.tar.gz
Other differences:
--
++ velocity.spec ++
--- /var/tmp/diff_new_pack.n3QxYo/_old 2014-12-09 09:13:54.0 +0100
+++ /var/tmp/diff_new_pack.n3QxYo/_new 2014-12-09 09:13:54.0 +0100
@@ -17,13 +17,13 @@
Name: velocity
-Version:1.5
+Version:1.7
Release:0
Summary:Java-based template engine
License:Apache-2.0
Group: Development/Libraries/Java
-Source0:
http://www.apache.org/dist/velocity/engine/1.5/velocity-1.5.tar.bz2
-Source1:
http://repo1.maven.org/maven2/velocity/velocity/1.5/velocity-1.5.pom
+Source0:
http://www.apache.org/dist/velocity/engine/1.7/%{name}-%{version}.tar.gz
+Source1:%{name}-%{version}.pom
Patch0: velocity-build_xml.patch
Url:http://velocity.apache.org/
Requires: avalon-logkit
@@ -44,8 +44,8 @@
BuildRequires: classworlds
BuildRequires: commons-collections
BuildRequires: commons-lang
+BuildRequires: commons-logging
BuildRequires: hsqldb
-BuildRequires: java-devel = 1.6.0
BuildRequires: javapackages-tools
BuildRequires: jdom = 1.0-1
BuildRequires: junit
@@ -187,6 +187,7 @@
ln -sf $(build-classpath avalon-logkit)
ln -sf $(build-classpath commons-collections)
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 oro)
@@ -220,7 +221,7 @@
rm -rf docs/api
# data
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pr examples test $RPM_BUILD_ROOT%{_datadir}/%{name}
%fdupes -s %{buildroot}
%files
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit velocity for openSUSE:Factory
Hello community, here is the log from the commit of package velocity for openSUSE:Factory checked in at 2014-06-30 22:50:17 Comparing /work/SRC/openSUSE:Factory/velocity (Old) and /work/SRC/openSUSE:Factory/.velocity.new (New) Package is velocity Changes: --- /work/SRC/openSUSE:Factory/velocity/velocity.changes2013-09-12 13:26:37.0 +0200 +++ /work/SRC/openSUSE:Factory/.velocity.new/velocity.changes 2014-06-30 22:50:25.0 +0200 @@ -1,0 +2,5 @@ +Fri Jun 27 14:17:29 UTC 2014 - tchva...@suse.com + +- Fix build on SLE11 + +--- Other differences: -- ++ velocity.spec ++ --- /var/tmp/diff_new_pack.tjSUjb/_old 2014-06-30 22:50:27.0 +0200 +++ /var/tmp/diff_new_pack.tjSUjb/_new 2014-06-30 22:50:27.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package velocity # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -200,6 +200,7 @@ #FIXME: tests failed on CommonsExtPropTestCase #but resulting files seems to be same ant \ + -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ -buildfile build/build.xml \ jar javadocs #test -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit velocity for openSUSE:Factory
Hello community,
here is the log from the commit of package velocity for openSUSE:Factory
checked in at 2013-09-12 13:26:36
Comparing /work/SRC/openSUSE:Factory/velocity (Old)
and /work/SRC/openSUSE:Factory/.velocity.new (New)
Package is velocity
Changes:
--- /work/SRC/openSUSE:Factory/velocity/velocity.changes2012-12-19
13:35:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.velocity.new/velocity.changes 2013-09-12
13:26:37.0 +0200
@@ -1,0 +2,10 @@
+Wed Sep 11 08:47:42 UTC 2013 - mvysko...@suse.com
+
+- use add_maven_depmap from javapackages-tools
+
+---
+Mon Sep 9 11:06:25 UTC 2013 - tchva...@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+---
Other differences:
--
++ velocity.spec ++
--- /var/tmp/diff_new_pack.p1zshh/_old 2013-09-12 13:26:38.0 +0200
+++ /var/tmp/diff_new_pack.p1zshh/_new 2013-09-12 13:26:38.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package velocity
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products 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,8 +16,6 @@
#
-%define section free
-
Name: velocity
Version:1.5
Release:0
@@ -48,8 +46,8 @@
BuildRequires: commons-lang
BuildRequires: hsqldb
BuildRequires: java-devel = 1.6.0
+BuildRequires: javapackages-tools
BuildRequires: jdom = 1.0-1
-BuildRequires: jpackage-utils = 1.7.4
BuildRequires: junit
BuildRequires: log4j = 1.1
BuildRequires: oro
@@ -57,8 +55,8 @@
BuildRequires: fdupes
BuildRequires: servletapi4
BuildRequires: werken-xpath
-Requires(post):jpackage-utils = 1.7.4
-Requires(postun): jpackage-utils = 1.7.4
+Requires(post):javapackages-tools
+Requires(postun): javapackages-tools
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -208,36 +206,27 @@
%install
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 bin/%{name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%add_to_maven_depmap org.apache.velocity velocity %{version} JPP %{name}
-(cd $RPM_BUILD_ROOT%{_javadir} for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed s|-%{version}||g`; done)
+install -p -m 644 bin/%{name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 %{SOURCE1} \
-$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
+
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf docs/api
# data
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name}
%fdupes -s %{buildroot}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%defattr(0644,root,root,0755)
%doc LICENSE NOTICE README.txt
%{_javadir}/*.jar
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
%config %{_mavendepmapfragdir}
%files manual
@@ -246,7 +235,7 @@
%files javadoc
%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
%files demo
%defattr(0644,root,root,0755)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit velocity for openSUSE:Factory
Hello community,
here is the log from the commit of package velocity for openSUSE:Factory
checked in at 2012-12-19 13:35:05
Comparing /work/SRC/openSUSE:Factory/velocity (Old)
and /work/SRC/openSUSE:Factory/.velocity.new (New)
Package is velocity, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/velocity/velocity.changes2011-09-23
12:49:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.velocity.new/velocity.changes 2012-12-19
13:35:07.0 +0100
@@ -1,0 +2,6 @@
+Mon Dec 17 12:17:24 UTC 2012 - mvysko...@suse.com
+
+- require avalon-logkit
+ * drop excalibur from Factory
+
+---
Other differences:
--
++ velocity.spec ++
--- /var/tmp/diff_new_pack.53fBha/_old 2012-12-19 13:35:08.0 +0100
+++ /var/tmp/diff_new_pack.53fBha/_new 2012-12-19 13:35:08.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package velocity (Version 1.5)
+# spec file for package velocity
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,18 +20,18 @@
Name: velocity
Version:1.5
-Release:1
+Release:0
Summary:Java-based template engine
License:Apache-2.0
+Group: Development/Libraries/Java
Source0:
http://www.apache.org/dist/velocity/engine/1.5/velocity-1.5.tar.bz2
Source1:
http://repo1.maven.org/maven2/velocity/velocity/1.5/velocity-1.5.pom
Patch0: velocity-build_xml.patch
Url:http://velocity.apache.org/
-Group: Development/Libraries/Java
+Requires: avalon-logkit
+Requires: commons-collections
+Requires: commons-lang
Requires: java = 1.5.0
-Requires: excalibur-avalon-logkit
-Requires: jakarta-commons-collections
-Requires: jakarta-commons-lang
Requires: jdom = 1.0-1
Requires: log4j = 1.1
#Requires: jakarta-oro
@@ -39,24 +39,24 @@
# Use servletapi4 instead of servletapi5
Requires: servletapi4
Requires: werken-xpath
-BuildRequires: jpackage-utils = 1.7.4
-BuildRequires: java-devel = 1.5.0
BuildRequires: ant = 1.6.5
BuildRequires: ant-junit
BuildRequires: antlr
-BuildRequires: junit
-BuildRequires: hsqldb
+BuildRequires: avalon-logkit
BuildRequires: classworlds
-BuildRequires: excalibur-avalon-logkit
-BuildRequires: jakarta-commons-collections
-BuildRequires: jakarta-commons-lang
+BuildRequires: commons-collections
+BuildRequires: commons-lang
+BuildRequires: hsqldb
+BuildRequires: java-devel = 1.6.0
BuildRequires: jdom = 1.0-1
+BuildRequires: jpackage-utils = 1.7.4
+BuildRequires: junit
BuildRequires: log4j = 1.1
BuildRequires: oro
# Use servletapi4 instead of servletapi5
+BuildRequires: fdupes
BuildRequires: servletapi4
BuildRequires: werken-xpath
-BuildRequires: fdupes
Requires(post):jpackage-utils = 1.7.4
Requires(postun): jpackage-utils = 1.7.4
BuildArch: noarch
@@ -84,7 +84,6 @@
applications to be developed according to a true MVC model.
%packagemanual
-License:Apache-2.0
Summary:Manual for %{name}
Group: Development/Libraries/Java
@@ -110,9 +109,8 @@
applications to be developed according to a true MVC model.
%packagejavadoc
-License:Apache-2.0
Summary:Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation/HTML
Requires(post): %{__rm}
Requires(post): /bin/ln
Requires(postun): %{__rm}
@@ -139,7 +137,6 @@
applications to be developed according to a true MVC model.
%packagedemo
-License:Apache-2.0
Summary:Demo for %{name}
Group: Development/Libraries/Java
Requires: %{name} = %{version}-%{release}
@@ -178,7 +175,7 @@
#%patch99 -b .sav99
%build
-export JAVA_HOME=%{_jvmdir}/java-1.5.0
+#export JAVA_HOME=%{_jvmdir}/java-1.5.0
# Use servletapi4 instead of servletapi5 in CLASSPATH
mkdir -p bin/test-lib
pushd bin/test-lib
@@ -189,7 +186,7 @@
pushd bin/lib
ln -sf $(build-classpath ant)
ln -sf $(build-classpath antlr)
-ln -sf $(build-classpath excalibur/avalon-logkit)
+ln -sf $(build-classpath avalon-logkit)
ln -sf $(build-classpath commons-collections)
ln -sf $(build-classpath commons-lang)
ln -sf $(build-classpath jdom)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit velocity for openSUSE:Factory
Hello community,
here is the log from the commit of package velocity for openSUSE:Factory
checked in at 2011-12-06 19:11:38
Comparing /work/SRC/openSUSE:Factory/velocity (Old)
and /work/SRC/openSUSE:Factory/.velocity.new (New)
Package is velocity, Maintainer is r...@suse.com
Changes:
Other differences:
--
++ velocity.spec ++
--- /var/tmp/diff_new_pack.y6dPTI/_old 2011-12-06 19:46:02.0 +0100
+++ /var/tmp/diff_new_pack.y6dPTI/_new 2011-12-06 19:46:02.0 +0100
@@ -22,7 +22,7 @@
Version:1.5
Release:1
Summary:Java-based template engine
-License:Apache Software License
+License:Apache-2.0
Source0:
http://www.apache.org/dist/velocity/engine/1.5/velocity-1.5.tar.bz2
Source1:
http://repo1.maven.org/maven2/velocity/velocity/1.5/velocity-1.5.pom
Patch0: velocity-build_xml.patch
@@ -84,7 +84,7 @@
applications to be developed according to a true MVC model.
%packagemanual
-License:Apache Software License
+License:Apache-2.0
Summary:Manual for %{name}
Group: Development/Libraries/Java
@@ -110,7 +110,7 @@
applications to be developed according to a true MVC model.
%packagejavadoc
-License:Apache Software License
+License:Apache-2.0
Summary:Javadoc for %{name}
Group: Development/Documentation
Requires(post): %{__rm}
@@ -139,7 +139,7 @@
applications to be developed according to a true MVC model.
%packagedemo
-License:Apache Software License
+License:Apache-2.0
Summary:Demo for %{name}
Group: Development/Libraries/Java
Requires: %{name} = %{version}-%{release}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
