commit servletapi4 for openSUSE:Factory
Hello community, here is the log from the commit of package servletapi4 for openSUSE:Factory checked in at 2017-09-21 12:32:59 Comparing /work/SRC/openSUSE:Factory/servletapi4 (Old) and /work/SRC/openSUSE:Factory/.servletapi4.new (New) Package is "servletapi4" Thu Sep 21 12:32:59 2017 rev:20 rq:527019 version:4.0.4 Changes: --- /work/SRC/openSUSE:Factory/servletapi4/servletapi4.changes 2017-09-13 22:22:28.038066524 +0200 +++ /work/SRC/openSUSE:Factory/.servletapi4.new/servletapi4.changes 2017-09-21 12:33:03.546345539 +0200 @@ -1,0 +2,7 @@ +Mon Sep 18 12:47:42 UTC 2017 - fst...@suse.com + +- Modified patch: + * java160_build.patch ++ Don't switch off doclint; it is switched off by default + +--- Other differences: -- ++ java160_build.patch ++ --- /var/tmp/diff_new_pack.0dsdW1/_old 2017-09-21 12:33:04.470215526 +0200 +++ /var/tmp/diff_new_pack.0dsdW1/_new 2017-09-21 12:33:04.474214963 +0200 @@ -14,7 +14,7 @@
commit servletapi4 for openSUSE:Factory
Hello community,
here is the log from the commit of package servletapi4 for openSUSE:Factory
checked in at 2017-09-13 22:22:25
Comparing /work/SRC/openSUSE:Factory/servletapi4 (Old)
and /work/SRC/openSUSE:Factory/.servletapi4.new (New)
Package is "servletapi4"
Wed Sep 13 22:22:25 2017 rev:19 rq:522887 version:4.0.4
Changes:
--- /work/SRC/openSUSE:Factory/servletapi4/servletapi4.changes 2015-10-14
16:41:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.servletapi4.new/servletapi4.changes
2017-09-13 22:22:28.038066524 +0200
@@ -1,0 +2,11 @@
+Sun Sep 10 13:00:57 UTC 2017 - fst...@suse.com
+
+- Removed patch:
+ * java150_build.patch
+- Added patch:
+ * java160_build.patch
++ Specify java source and target level 1.6 in order to allow
+ building with jdk9
++ Disable doclint, since errors of javadoc in jdk9 are fatal
+
+---
Old:
java150_build.patch
New:
java160_build.patch
Other differences:
--
++ servletapi4.spec ++
--- /var/tmp/diff_new_pack.YXmeFP/_old 2017-09-13 22:22:28.813957293 +0200
+++ /var/tmp/diff_new_pack.YXmeFP/_new 2017-09-13 22:22:28.817956729 +0200
@@ -1,7 +1,7 @@
#
# spec file for package servletapi4
#
-# 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
@@ -26,7 +26,7 @@
Group: Development/Libraries/Java
Url:http://jakarta.apache.org/tomcat/
Source: %{full_name}-4-src.tar.gz
-Patch150: java150_build.patch
+Patch160: java160_build.patch
BuildRequires: ant
BuildRequires: ant >= 1.2
BuildRequires: java-devel >= 1.7.0
@@ -56,7 +56,7 @@
%prep
%setup -q -n %{full_name}-4-src
-%patch150 -p1
+%patch160 -p1
%build
ant dist -Dservletapi.build=build -Dservletapi.dist=dist
++ java150_build.patch -> java160_build.patch ++
--- /work/SRC/openSUSE:Factory/servletapi4/java150_build.patch 2011-09-23
12:46:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.servletapi4.new/java160_build.patch
2017-09-13 22:22:27.490143661 +0200
@@ -6,7 +6,7 @@
@@ -14,7 +14,7 @@
commit servletapi4 for openSUSE:Factory
Hello community,
here is the log from the commit of package servletapi4 for openSUSE:Factory
checked in at 2015-10-14 16:41:22
Comparing /work/SRC/openSUSE:Factory/servletapi4 (Old)
and /work/SRC/openSUSE:Factory/.servletapi4.new (New)
Package is "servletapi4"
Changes:
--- /work/SRC/openSUSE:Factory/servletapi4/servletapi4.changes 2014-08-01
19:26:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.servletapi4.new/servletapi4.changes
2015-10-14 16:41:23.0 +0200
@@ -1,0 +2,5 @@
+Tue Sep 29 20:07:26 UTC 2015 - dmuel...@suse.com
+
+- build against java-1_8_0-openjdk or newer if available
+
+---
Other differences:
--
++ servletapi4.spec ++
--- /var/tmp/diff_new_pack.Rok1BQ/_old 2015-10-14 16:41:23.0 +0200
+++ /var/tmp/diff_new_pack.Rok1BQ/_new 2015-10-14 16:41:23.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package servletapi4
#
-# 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
@@ -29,7 +29,7 @@
Patch150: java150_build.patch
BuildRequires: ant
BuildRequires: ant >= 1.2
-BuildRequires: java2-devel-packages
+BuildRequires: java-devel >= 1.7.0
BuildRequires: javapackages-tools
BuildRequires: xml-commons-apis
Requires(post): %{_sbindir}/update-alternatives
commit servletapi4 for openSUSE:Factory
Hello community,
here is the log from the commit of package servletapi4 for openSUSE:Factory
checked in at 2014-08-01 19:26:58
Comparing /work/SRC/openSUSE:Factory/servletapi4 (Old)
and /work/SRC/openSUSE:Factory/.servletapi4.new (New)
Package is "servletapi4"
Changes:
--- /work/SRC/openSUSE:Factory/servletapi4/servletapi4.changes 2014-04-15
11:47:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.servletapi4.new/servletapi4.changes
2014-08-01 19:26:59.0 +0200
@@ -1,0 +2,6 @@
+Mon Jul 21 10:32:00 UTC 2014 - tchva...@suse.com
+
+- Cleanup with spec-cleaner
+- Fix update-alternatives
+
+---
Other differences:
--
++ servletapi4.spec ++
--- /var/tmp/diff_new_pack.kVEJgu/_old 2014-08-01 19:27:00.0 +0200
+++ /var/tmp/diff_new_pack.kVEJgu/_new 2014-08-01 19:27:00.0 +0200
@@ -16,57 +16,46 @@
#
-Name: servletapi4
-BuildRequires: ant
-BuildRequires: java2-devel-packages
-BuildRequires: xml-commons-apis
%definebase_name servletapi
-%definemajor_version 4
-%definename%{base_name}%{major_version}
%define full_name jakarta-%{base_name}
-%defineversion 4.0.4
-%define release3jpp
-%define sectionfree
+Name: servletapi4
Version:4.0.4
Release:0
Summary:Java servlet and JSP implementation classes
License:Apache-1.1
Group: Development/Libraries/Java
+Url:http://jakarta.apache.org/tomcat/
Source: %{full_name}-4-src.tar.gz
Patch150: java150_build.patch
-Url:http://jakarta.apache.org/tomcat/
-Provides: servlet
-PreReq: /usr/sbin/update-alternatives
+BuildRequires: ant
BuildRequires: ant >= 1.2
+BuildRequires: java2-devel-packages
BuildRequires: javapackages-tools
-BuildArch: noarch
+BuildRequires: xml-commons-apis
+Requires(post): %{_sbindir}/update-alternatives
+Provides: servlet = %{version}
+Obsoletes: servlet22 < %{version}
+Obsoletes: servlet4 < %{version}
+Provides: servlet22 = %{version}
+Provides: servlet4 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Obsoletes: servlet23
-Obsoletes: servlet4
-Provides: servlet23
-Provides: servlet4
+BuildArch: noarch
%description
This subproject contains the source code for the implementation classes
of the Java Servlet and JSP APIs (packages javax.servlet).
-
-
%package javadoc
Summary:Javadoc for servletapi4
Group: Development/Libraries/Java
-PreReq: coreutils
%description javadoc
This subproject contains the source code for the implementation classes
of the Java Servlet and JSP APIs (packages javax.servlet). This package
contains the javadoc documentation for the Java Servlet and JSP APIs.
-
-
%prep
-rm -rf $RPM_BUILD_ROOT
-%setup -n %{full_name}-4-src
+%setup -q -n %{full_name}-4-src
%patch150 -p1
%build
@@ -74,15 +63,15 @@
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/lib/servlet.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 dist/lib/servlet.jar
%{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name}
+# alternatives
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
+ln -sf %{_sysconfdir}/alternatives/servlet.jar
%{buildroot}%{_javadir}/servlet.jar
%post
update-alternatives --install %{_javadir}/servlet.jar servlet
%{_javadir}/%{name}-%{version}.jar 40
@@ -96,6 +85,8 @@
%defattr(-,root,root)
%doc LICENSE README.txt
%{_javadir}/*
+%{_javadir}/servlet.jar
+%ghost %{_sysconfdir}/alternatives/servlet.jar
%files javadoc
%defattr(-,root,root)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit servletapi4 for openSUSE:Factory
Hello community,
here is the log from the commit of package servletapi4 for openSUSE:Factory
checked in at 2014-04-15 11:47:00
Comparing /work/SRC/openSUSE:Factory/servletapi4 (Old)
and /work/SRC/openSUSE:Factory/.servletapi4.new (New)
Package is "servletapi4"
Changes:
--- /work/SRC/openSUSE:Factory/servletapi4/servletapi4.changes 2013-09-12
17:04:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.servletapi4.new/servletapi4.changes
2014-04-15 11:47:02.0 +0200
@@ -1,0 +2,5 @@
+Fri Feb 7 08:46:53 UTC 2014 - fcro...@suse.com
+
+- Fix license tag, should be Apache-1.1
+
+---
Other differences:
--
++ servletapi4.spec ++
--- /var/tmp/diff_new_pack.aqsf4G/_old 2014-04-15 11:47:02.0 +0200
+++ /var/tmp/diff_new_pack.aqsf4G/_new 2014-04-15 11:47:02.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package servletapi4
#
-# 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
@@ -30,7 +30,7 @@
Version:4.0.4
Release:0
Summary:Java servlet and JSP implementation classes
-License:Apache-2.0
+License:Apache-1.1
Group: Development/Libraries/Java
Source: %{full_name}-4-src.tar.gz
Patch150: java150_build.patch
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit servletapi4 for openSUSE:Factory
Hello community,
here is the log from the commit of package servletapi4 for openSUSE:Factory
checked in at 2013-09-12 17:04:31
Comparing /work/SRC/openSUSE:Factory/servletapi4 (Old)
and /work/SRC/openSUSE:Factory/.servletapi4.new (New)
Package is "servletapi4"
Changes:
--- /work/SRC/openSUSE:Factory/servletapi4/servletapi4.changes 2011-09-23
12:46:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.servletapi4.new/servletapi4.changes
2013-09-12 17:04:33.0 +0200
@@ -1,0 +2,5 @@
+Mon Sep 9 11:06:21 UTC 2013 - tchva...@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+---
Other differences:
--
++ servletapi4.spec ++
--- /var/tmp/diff_new_pack.t00OdN/_old 2013-09-12 17:04:34.0 +0200
+++ /var/tmp/diff_new_pack.t00OdN/_new 2013-09-12 17:04:34.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package servletapi4 (Version 4.0.4)
+# spec file for package servletapi4
#
-# Copyright (c) 2009 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
@@ -15,11 +15,11 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: servletapi4
-BuildRequires: ant java2-devel-packages xml-commons-apis
+BuildRequires: ant
+BuildRequires: java2-devel-packages
+BuildRequires: xml-commons-apis
%definebase_name servletapi
%definemajor_version 4
%definename%{base_name}%{major_version}
@@ -28,7 +28,7 @@
%define release3jpp
%define sectionfree
Version:4.0.4
-Release:272
+Release:0
Summary:Java servlet and JSP implementation classes
License:Apache-2.0
Group: Development/Libraries/Java
@@ -38,13 +38,13 @@
Provides: servlet
PreReq: /usr/sbin/update-alternatives
BuildRequires: ant >= 1.2
-BuildRequires: jpackage-utils > 1.4
+BuildRequires: javapackages-tools
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Obsoletes: servlet4
Obsoletes: servlet23
-Provides: servlet4
+Obsoletes: servlet4
Provides: servlet23
+Provides: servlet4
%description
This subproject contains the source code for the implementation classes
@@ -53,9 +53,8 @@
%package javadoc
-License:Apache-2.0
-Group: Development/Libraries/Java
Summary:Javadoc for servletapi4
+Group: Development/Libraries/Java
PreReq: coreutils
%description javadoc
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit servletapi4 for openSUSE:Factory
Hello community,
here is the log from the commit of package servletapi4 for openSUSE:Factory
checked in at 2011-12-06 19:03:40
Comparing /work/SRC/openSUSE:Factory/servletapi4 (Old)
and /work/SRC/openSUSE:Factory/.servletapi4.new (New)
Package is "servletapi4", Maintainer is "bnc-team-j...@forge.provo.novell.com"
Changes:
Other differences:
--
++ servletapi4.spec ++
--- /var/tmp/diff_new_pack.LNqcOS/_old 2011-12-06 19:36:55.0 +0100
+++ /var/tmp/diff_new_pack.LNqcOS/_new 2011-12-06 19:36:55.0 +0100
@@ -30,7 +30,7 @@
Version:4.0.4
Release:272
Summary:Java servlet and JSP implementation classes
-License:The Apache Software License
+License:Apache-2.0
Group: Development/Libraries/Java
Source: %{full_name}-4-src.tar.gz
Patch150: java150_build.patch
@@ -53,7 +53,7 @@
%package javadoc
-License:The Apache Software License
+License:Apache-2.0
Group: Development/Libraries/Java
Summary:Javadoc for servletapi4
PreReq: coreutils
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
