commit servletapi5 for openSUSE:Factory
Hello community,
here is the log from the commit of package servletapi5 for openSUSE:Factory
checked in at 2017-10-06 10:54:49
Comparing /work/SRC/openSUSE:Factory/servletapi5 (Old)
and /work/SRC/openSUSE:Factory/.servletapi5.new (New)
Package is "servletapi5"
Fri Oct 6 10:54:49 2017 rev:20 rq:530810 version:5.0.18
Changes:
--- /work/SRC/openSUSE:Factory/servletapi5/servletapi5.changes 2014-08-01
19:26:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.servletapi5.new/servletapi5.changes
2017-10-06 10:54:51.767244265 +0200
@@ -1,0 +2,11 @@
+Tue Oct 3 10:43:13 UTC 2017 - fst...@suse.com
+
+- Removed patch:
+ * java150_build.patch
+- Don't hardcode the source and target levels, specify them on
+ command line instead
+- Don't build with java-1_5_0-gcj-compat, since it is bound to go
+- Specify source and target level 1.6 in order to allow building
+ with jdk9
+
+---
Old:
java150_build.patch
Other differences:
--
++ servletapi5.spec ++
--- /var/tmp/diff_new_pack.Z8pC4e/_old 2017-10-06 10:54:53.379000657 +0200
+++ /var/tmp/diff_new_pack.Z8pC4e/_new 2017-10-06 10:54:53.38352 +0200
@@ -1,7 +1,7 @@
#
# spec file for package servletapi5
#
-# Copyright (c) 2014 SUSE LINUX Products 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,11 +26,10 @@
Group: Development/Libraries/Java
Url:http://jakarta.apache.org/tomcat/
Source: %{full_name}-5-src.tar.gz
-Patch150: java150_build.patch
#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis
#!BuildIgnore: xml-commons-jaxp-1.3-apis
BuildRequires: ant
-BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: java-devel
BuildRequires: xml-commons-apis-bootstrap
Requires(post): update-alternatives
Provides: servlet = %{version}
@@ -45,7 +44,6 @@
%prep
%setup -q -c -T -a 0 -n %{full_name}-5-src
-%patch150
%build
# Fix us a license file first
@@ -54,11 +52,11 @@
find . -type f -name "*.jar" -exec rm -f {} \;
pushd .
cd jsr154
-ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist
+ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6
popd
pushd .
cd jsr152
-ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist
+ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6
popd
%install
commit servletapi5 for openSUSE:Factory
Hello community,
here is the log from the commit of package servletapi5 for openSUSE:Factory
checked in at 2014-08-01 19:26:56
Comparing /work/SRC/openSUSE:Factory/servletapi5 (Old)
and /work/SRC/openSUSE:Factory/.servletapi5.new (New)
Package is servletapi5
Changes:
--- /work/SRC/openSUSE:Factory/servletapi5/servletapi5.changes 2013-08-25
13:32:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.servletapi5.new/servletapi5.changes
2014-08-01 19:26:57.0 +0200
@@ -1,0 +2,6 @@
+Mon Jul 21 10:38:49 UTC 2014 - tchva...@suse.com
+
+- Cleanup with spec-cleaner.
+- Fix update-alternatives code
+
+---
Other differences:
--
++ servletapi5.spec ++
--- /var/tmp/diff_new_pack.RMJYhH/_old 2014-08-01 19:26:57.0 +0200
+++ /var/tmp/diff_new_pack.RMJYhH/_new 2014-08-01 19:26:57.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package servletapi5
#
-# 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
@@ -16,40 +16,34 @@
#
-Name: servletapi5
-BuildRequires: ant
-BuildRequires: java-1_5_0-gcj-compat-devel
-BuildRequires: xml-commons-apis-bootstrap
-#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis
-#!BuildIgnore: xml-commons-jaxp-1.3-apis
%definebase_name servletapi
-%definemajor_version 5
-%definename%{base_name}%{major_version}
%define full_name jakarta-%{base_name}
-%defineversion 5.0.18
-%define release1jpp
-%define sectionfree
+Name: servletapi5
Version:5.0.18
Release:0
Summary:Java servlet and JSP implementation classes
License:Apache-2.0
Group: Development/Libraries/Java
+Url:http://jakarta.apache.org/tomcat/
Source: %{full_name}-5-src.tar.gz
Patch150: java150_build.patch
-Url:http://jakarta.apache.org/tomcat/
-Requires: /usr/sbin/update-alternatives
-BuildArch: noarch
+#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis
+#!BuildIgnore: xml-commons-jaxp-1.3-apis
+BuildRequires: ant
+BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: xml-commons-apis-bootstrap
+Requires(post): update-alternatives
+Provides: servlet = %{version}
+Provides: servlet24 = %{version}
+Provides: servlet5 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Provides: servlet
-Provides: servlet24
-Provides: servlet5
+BuildArch: noarch
%description
This subproject contains the source code for the implementation classes
of the Java Servlet and JSP APIs (packages javax.servlet).
%prep
-rm -rf $RPM_BUILD_ROOT
%setup -q -c -T -a 0 -n %{full_name}-5-src
%patch150
@@ -70,14 +64,27 @@
%install
cd jakarta-tomcat-%{version}-src/jakarta-servletapi-5
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 jsr152/dist/lib/jsp-api.jar
$RPM_BUILD_ROOT%{_javadir}/jspapi-%{version}.jar
-install -m 644 jsr154/dist/lib/servlet-api.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 jsr152/dist/lib/jsp-api.jar
%{buildroot}%{_javadir}/jspapi-%{version}.jar
+install -m 644 jsr154/dist/lib/servlet-api.jar
%{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed s|-%{version}||g`; done)
+# 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 50
+
+%postun
+if [ $1 = 0 ]; then
+update-alternatives --remove servlet %{_javadir}/%{name}-%{version}.jar
+fi
%files
%defattr(-,root,root)
%doc LICENSE
%{_javadir}/*
+%{_javadir}/servlet.jar
+%ghost %{_sysconfdir}/alternatives/servlet.jar
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit servletapi5 for openSUSE:Factory
Hello community,
here is the log from the commit of package servletapi5 for openSUSE:Factory
checked in at 2013-08-25 13:32:40
Comparing /work/SRC/openSUSE:Factory/servletapi5 (Old)
and /work/SRC/openSUSE:Factory/.servletapi5.new (New)
Package is servletapi5
Changes:
--- /work/SRC/openSUSE:Factory/servletapi5/servletapi5.changes 2011-09-23
12:46:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.servletapi5.new/servletapi5.changes
2013-08-25 13:32:41.0 +0200
@@ -1,0 +2,5 @@
+Fri Aug 23 11:38:55 UTC 2013 - mvysko...@suse.com
+
+- drop javadoc package
+
+---
Other differences:
--
++ servletapi5.spec ++
--- /var/tmp/diff_new_pack.jLcOJQ/_old 2013-08-25 13:32:42.0 +0200
+++ /var/tmp/diff_new_pack.jLcOJQ/_new 2013-08-25 13:32:42.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package servletapi5 (Version 5.0.18)
+# spec file for package servletapi5
#
-# Copyright (c) 2010 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: servletapi5
-BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap
+BuildRequires: ant
+BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: xml-commons-apis-bootstrap
#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis
#!BuildIgnore: xml-commons-jaxp-1.3-apis
%definebase_name servletapi
@@ -30,7 +30,7 @@
%define release1jpp
%define sectionfree
Version:5.0.18
-Release:268
+Release:0
Summary:Java servlet and JSP implementation classes
License:Apache-2.0
Group: Development/Libraries/Java
@@ -40,33 +40,14 @@
Requires: /usr/sbin/update-alternatives
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-#Obsoletes:servlet4
-#Obsoletes:servlet23
Provides: servlet
-Provides: servlet5
Provides: servlet24
+Provides: servlet5
%description
This subproject contains the source code for the implementation classes
of the Java Servlet and JSP APIs (packages javax.servlet).
-
-
-%package javadoc
-License:Apache-2.0
-Group: Development/Libraries/Java
-Summary:Javadoc for servletapi5
-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 -q -c -T -a 0 -n %{full_name}-5-src
@@ -79,11 +60,11 @@
find . -type f -name *.jar -exec rm -f {} \;
pushd .
cd jsr154
-ant dist -Dservletapi.build=build -Dservletapi.dist=dist
+ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist
popd
pushd .
cd jsr152
-ant dist -Dservletapi.build=build -Dservletapi.dist=dist
+ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist
popd
%install
@@ -93,44 +74,10 @@
install -m 644 jsr152/dist/lib/jsp-api.jar
$RPM_BUILD_ROOT%{_javadir}/jspapi-%{version}.jar
install -m 644 jsr154/dist/lib/servlet-api.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)
-# javadoc jsp
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/jsp-api-%{version}
-cp -pr jsr152/build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/jsp-api-%{version}
-ln -s jsp-api-%{version} $RPM_BUILD_ROOT%{_javadocdir}/jsp-api # ghost symlink
-# javadoc servlet
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr jsr154/build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-#update-alternatives --install %{_javadir}/servlet.jar servlet
%{_javadir}/%{name}-%{version}.jar 50
-#update-alternatives --install %{_javadir}/jsp.jar jsp
%{_javadir}/jsp-api-%{version}.jar 50
-
-%postun
-#if [ $1 = 0 ]; then
-# update-alternatives --remove servlet %{_javadir}/%{name}-%{version}.jar
-# update-alternatives --remove jsp %{_javadir}/jsp-api-%{version}.jar
-#fi
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-rm -f %{_javadocdir}/jsp-api
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-ln -s
commit servletapi5 for openSUSE:Factory
Hello community,
here is the log from the commit of package servletapi5 for openSUSE:Factory
checked in at 2011-12-06 19:03:41
Comparing /work/SRC/openSUSE:Factory/servletapi5 (Old)
and /work/SRC/openSUSE:Factory/.servletapi5.new (New)
Package is servletapi5, Maintainer is bnc-team-j...@forge.provo.novell.com
Changes:
Other differences:
--
++ servletapi5.spec ++
--- /var/tmp/diff_new_pack.Lk57Ks/_old 2011-12-06 19:36:57.0 +0100
+++ /var/tmp/diff_new_pack.Lk57Ks/_new 2011-12-06 19:36:57.0 +0100
@@ -32,7 +32,7 @@
Version:5.0.18
Release:268
Summary:Java servlet and JSP implementation classes
-License:ASLv..
+License:Apache-2.0
Group: Development/Libraries/Java
Source: %{full_name}-5-src.tar.gz
Patch150: java150_build.patch
@@ -53,7 +53,7 @@
%package javadoc
-License:ASLv..
+License:Apache-2.0
Group: Development/Libraries/Java
Summary:Javadoc for servletapi5
PreReq: coreutils
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
