From 7682000907958c992db5f02fc12bf38ffb5f128a813403d8c0202df043fa43e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 18 Mar 2015 10:16:20 +0000 Subject: [PATCH 1/4] - Fix build with new jpackage-tools OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=63 --- tomcat.changes | 5 +++++ tomcat.spec | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index b34e14c..f12f8d9 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 18 10:16:07 UTC 2015 - tchvatal@suse.com + +- Fix build with new jpackage-tools + ------------------------------------------------------------------- Wed Sep 17 11:28:46 UTC 2014 - bmaryniuk@suse.com diff --git a/tomcat.spec b/tomcat.spec index 135d713..748336c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,7 +1,7 @@ # # spec file for package tomcat # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -736,7 +736,7 @@ rm -f \ %{_javadir}/%{name}-el-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar %{_mavenpomdir}/JPP-%{name}-el-api.pom -%{_mavendepmapfragdir}/%{name}-tomcat-el-api +%{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml %{_javadir}/el_1_0_api.jar %{_javadir}/el_api.jar %ghost %{_sysconfdir}/alternatives/el_1_0_api.jar @@ -753,14 +753,14 @@ rm -f \ %{_javadir}/jsp.jar %ghost %{_sysconfdir}/alternatives/jsp.jar %{_mavenpomdir}/JPP-%{name}-jsp-api.pom -%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api +%{_datadir}/maven-metadata/{name}-tomcat-jsp-api.xml %files lib %defattr(-,root,root) %{libdir} %dir %{bindir} %{bindir}/tomcat-juli.jar -%{_mavendepmapfragdir}/%{name} +%{_datadir}/maven-metadata/%{name}.xml %{_mavenpomdir}/JPP.%{name}-annotations-api.pom %{_mavenpomdir}/JPP.%{name}-catalina-ha.pom %{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom @@ -796,7 +796,7 @@ rm -f \ %{_javadir}/%{name}-servlet-api.jar %{_javadir}/servlet.jar %ghost %{_sysconfdir}/alternatives/servlet.jar -%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api +%{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml %{_mavenpomdir}/JPP-%{name}-servlet-api.pom %files webapps From e80abf11c9f6772af4e840d9c355ac7bbc47c4b50c8f5c394a4b0749a4be081c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 18 Mar 2015 10:20:41 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=64 --- tomcat.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 748336c..04c60dc 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -753,7 +753,7 @@ rm -f \ %{_javadir}/jsp.jar %ghost %{_sysconfdir}/alternatives/jsp.jar %{_mavenpomdir}/JPP-%{name}-jsp-api.pom -%{_datadir}/maven-metadata/{name}-tomcat-jsp-api.xml +%{_datadir}/maven-metadata/{name}-jsp-api.xml %files lib %defattr(-,root,root) @@ -796,7 +796,7 @@ rm -f \ %{_javadir}/%{name}-servlet-api.jar %{_javadir}/servlet.jar %ghost %{_sysconfdir}/alternatives/servlet.jar -%{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml +%{_datadir}/maven-metadata/%{name}-servlet-api.xml %{_mavenpomdir}/JPP-%{name}-servlet-api.pom %files webapps From 470c90868163616d52898a7c465c1bfd1091859cd86652661d22077ae3afbd45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 18 Mar 2015 10:22:44 +0000 Subject: [PATCH 3/4] - Drop gpg verification from spec, it is done by obs OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=65 --- tomcat.changes | 5 +++++ tomcat.spec | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index f12f8d9..9e3846f 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 18 10:22:27 UTC 2015 - tchvatal@suse.com + +- Drop gpg verification from spec, it is done by obs + ------------------------------------------------------------------- Wed Mar 18 10:16:07 UTC 2015 - tchvatal@suse.com diff --git a/tomcat.spec b/tomcat.spec index 04c60dc..ecd4298 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -111,9 +111,6 @@ Requires(preun): /sbin/chkconfig Recommends: libtcnative-1-0 >= 1.1.24 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%if 0%{?suse_version} > 1220 -BuildRequires: gpg-offline -%endif %if %{with_systemd} BuildRequires: systemd %systemd_requires @@ -239,10 +236,6 @@ Requires: jakarta-taglibs-standard >= 1.1 The ROOT and examples web applications for Apache Tomcat %prep -%if 0%{?suse_version} > 1220 -%gpg_verify %{S:1001} -%endif - %setup -q -n %{packdname} # remove pre-built binaries and windows files find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ From c65cfbd0594f81486f4e1b5600dc94f29f6cdae9cb8154a3ce76d09cec376c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 24 Mar 2015 08:06:50 +0000 Subject: [PATCH 4/4] - Fix previous commit. Fix one rpmlint warning OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=66 --- tomcat.changes | 5 +++++ tomcat.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index 9e3846f..1ee80ad 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 24 08:06:33 UTC 2015 - tchvatal@suse.com + +- Fix previous commit. Fix one rpmlint warning + ------------------------------------------------------------------- Wed Mar 18 10:22:27 UTC 2015 - tchvatal@suse.com diff --git a/tomcat.spec b/tomcat.spec index ecd4298..2ab848c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -142,7 +142,7 @@ Summary: Libraries for Embedding Apache Tomcat Group: Productivity/Networking/Web/Servers %description embed -Embedded support for Tomcat +Embedded support (various Libraries) for Apache Tomcat %package docs-webapp Summary: The docs web application for Apache Tomcat @@ -746,7 +746,7 @@ rm -f \ %{_javadir}/jsp.jar %ghost %{_sysconfdir}/alternatives/jsp.jar %{_mavenpomdir}/JPP-%{name}-jsp-api.pom -%{_datadir}/maven-metadata/{name}-jsp-api.xml +%{_datadir}/maven-metadata/%{name}-tomcat-jsp-api.xml %files lib %defattr(-,root,root) @@ -789,7 +789,7 @@ rm -f \ %{_javadir}/%{name}-servlet-api.jar %{_javadir}/servlet.jar %ghost %{_sysconfdir}/alternatives/servlet.jar -%{_datadir}/maven-metadata/%{name}-servlet-api.xml +%{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml %{_mavenpomdir}/JPP-%{name}-servlet-api.pom %files webapps