Hello community,
here is the log from the commit of package jakarta-taglibs-standard for
openSUSE:Factory checked in at 2017-09-20 17:09:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-taglibs-standard (Old)
and /work/SRC/openSUSE:Factory/.jakarta-taglibs-standard.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-taglibs-standard"
Wed Sep 20 17:09:28 2017 rev:17 rq:527059 version:1.1.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-taglibs-standard/jakarta-taglibs-standard.changes
2015-10-08 08:24:52.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-taglibs-standard.new/jakarta-taglibs-standard.changes
2017-09-20 17:09:28.792676538 +0200
@@ -1,0 +2,10 @@
+Mon Sep 18 15:40:25 UTC 2017 - [email protected]
+
+- Modified patch:
+ * jakarta-taglibs-standard-1.1.1-build.patch
+ + Don't hardcode java source and target levels
+- Specify source and target level 1.6 in order to allow building
+ with jdk9
+- Clean spec file and fix some rpmlint errors
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-taglibs-standard.spec ++++++
--- /var/tmp/diff_new_pack.UlIE1i/_old 2017-09-20 17:09:29.360596592 +0200
+++ /var/tmp/diff_new_pack.UlIE1i/_new 2017-09-20 17:09:29.364596030 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-taglibs-standard
#
-# 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
@@ -31,12 +31,12 @@
Patch3: jakarta-taglibs-standard-java7.patch
Patch4: CVE-2015-0254.patch
BuildRequires: ant
+BuildRequires: fdupes
BuildRequires: java-devel
BuildRequires: servletapi5
BuildRequires: xalan-j2
Requires: servletapi5 >= 5.0.16
Requires: xalan-j2
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -70,6 +70,7 @@
%build
ant \
+ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Dfinal.name=%{short_name} \
-Dj2se.javadoc=%{_javadocdir}/java \
-f standard/build.xml \
@@ -85,14 +86,13 @@
# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr standard/dist/standard/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files
-%defattr(0644,root,root,0755)
%doc standard/README_src.txt standard/README_bin.txt
standard/dist/doc/doc/standard-doc/*.html
%{_javadir}/*
%files javadoc
-%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}
%changelog
++++++ jakarta-taglibs-standard-1.1.1-build.patch ++++++
--- /var/tmp/diff_new_pack.UlIE1i/_old 2017-09-20 17:09:29.396591526 +0200
+++ /var/tmp/diff_new_pack.UlIE1i/_new 2017-09-20 17:09:29.396591526 +0200
@@ -1,6 +1,6 @@
--- standard/build.xml
+++ standard/build.xml
-@@ -164,18 +164,17 @@
+@@ -164,14 +164,11 @@
<!-- Build the tag library itself -->
<target name="library-build" depends="prepare-build">
@@ -17,21 +17,3 @@
excludes="org/apache/taglibs/standard/lang/jstl/parser/jsp20/*
org/apache/taglibs/standard/lang/jpath/**
org/apache/taglibs/standard/lang/spel/**"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
-- optimize="${compile.optimize}"/>
-+ optimize="${compile.optimize}"
-+ source="1.5"
-+ target="1.5"/>
-
- <!-- copy the TLDs in META-INF -->
- <copy todir="${build.library}/META-INF">
-@@ -277,7 +276,9 @@
- classpath="${servlet24.jar}:${jsp20.jar}:${build.library}/classes"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
-- optimize="${compile.optimize}"/>
-+ optimize="${compile.optimize}"
-+ source="1.5"
-+ target="1.5"/>
-
- <!-- Copy web.xml + examples TLD -->
- <copy todir="${build.examples}/WEB-INF">
