commit 4fb6871ddbe4d3ab67eab82ceb337bc1642b7d0187cca243ae970c2fe3e7bd85 Author: Adrian Schröter Date: Fri May 3 12:48:20 2024 +0200 Sync from SUSE:SLFO:Main geronimo-specs revision f111243dbb7837600abea9c6d1b2b947 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/geronimo-specs-1.2-src.tar.xz b/geronimo-specs-1.2-src.tar.xz new file mode 100644 index 0000000..a9f2027 --- /dev/null +++ b/geronimo-specs-1.2-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e47962228b66b07a6e0789df985de5074ad4738ab002328e6e5bbdf7a176f03b +size 159836 diff --git a/geronimo-specs.build.xml b/geronimo-specs.build.xml new file mode 100644 index 0000000..fc1b955 --- /dev/null +++ b/geronimo-specs.build.xml @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#Generated by ant +#${gbuild.time} +version=${gbuild.ver} +groupId=org.apache.geronimo.specs +artifactId=${gbuild.id} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/geronimo-specs.changes b/geronimo-specs.changes new file mode 100644 index 0000000..e7749f3 --- /dev/null +++ b/geronimo-specs.changes @@ -0,0 +1,245 @@ +------------------------------------------------------------------- +Fri Oct 20 16:45:54 UTC 2023 - Fridrich Strba + +- Bringing back geronimo-j2ee-connector-1_5-api + +------------------------------------------------------------------- +Tue Oct 17 18:45:36 UTC 2023 - Fridrich Strba + +- Remove some more artifacts not used by anybody in our current + java stack +- Removed patch: + * sun-security-provider.patch + + not needed anymore, since the patched artifacts are not + built in this version + +------------------------------------------------------------------- +Mon Oct 16 13:36:57 UTC 2023 - Fridrich Strba + +- Allow building with with java > 1.8 + * remove corba modules that nobody requires and that need the + idlj compiler not present ni java >= 10 +- Added patch: + * sun-security-provider.patch + + remove bogus inclusion of sun.security.provider.Sun + +------------------------------------------------------------------- +Thu Aug 31 07:44:42 UTC 2023 - Fridrich Strba + +- Remove bogus dependency on avalon-logkit that our spec is adding +- Clean the spec file and use the new %%mvn_install_pom macro + +------------------------------------------------------------------- +Mon Jan 27 06:32:39 UTC 2020 - Fridrich Strba + +- On supported platforms, avoid building with OpenJ9, in order to + prevent build cycles. + +------------------------------------------------------------------- +Tue Dec 10 23:10:17 UTC 2019 - Fridrich Strba + +- Set version for the specs comming from tag 1_1_1 in order to + avoid unexpanded version macros in pom files. + +------------------------------------------------------------------- +Mon Apr 15 13:02:26 UTC 2019 - Fridrich Strba + +- Removed patches: + * geronimo-specs-1.2-pom_xml.patch + * geronimo-specs-corba-2.3-pom_xml.patch + * geronimo-specs-j2ee-1.4-pom_xml.patch + * geronimo-specs-j2ee-connector-1.5-pom_xml.patch + * geronimo-specs-jta-1.0.1B-pom_xml.patch + * geronimo-specs-servlet-2.4-pom_xml.patch + + Not needed since we are not building with maven and some + of the modifications are possible using the + javapackages-local macros. +- Remove all reference to parent pom, since we are not building + with maven, and don't package the parent pom in this build. +- Stop using alternatives to handle different versions of provides. +- Avoid multiplication of jar symlinks + +------------------------------------------------------------------- +Fri Apr 12 13:16:12 UTC 2019 - Julio Gonzalez Gil + +- Obsoletes, conflicts and provides must use only %%{version} as the + the release is managed automatically by OBS and not needed (bsc#1132514) + +------------------------------------------------------------------- +Tue Mar 19 18:58:56 UTC 2019 - Fridrich Strba + +- Let each package obsolete and conflict with the + %%{name}-poms < %%{version}-%%{release} in order to make upgrades + smooth + +------------------------------------------------------------------- +Thu Dec 13 17:26:30 UTC 2018 - Fridrich Strba + +- Add alias javax.jms:jms to geronimo-jms-1_1-api + +------------------------------------------------------------------- +Wed Nov 21 17:38:53 UTC 2018 - Fridrich Strba + +- Add aliases org.eclipse.jetty.orbit:javax.transaction and + javax.transaction:jta to geronimo-jta-1_1-api + +------------------------------------------------------------------- +Mon Nov 12 09:00:42 UTC 2018 - Fridrich Strba + +- Add alias javax.persistence:persistence-api to + geronimo-jpa-3.0-api subpackage + +------------------------------------------------------------------- +Mon Nov 12 04:49:55 UTC 2018 - Fridrich Strba + +- Package the pom files together with their corresponding jars, + since packaging poms separately makes no sense at all +- Rename geronimo-specs-poms package to geronimo-specs-pom, since + it now contains only the parent pom. + +------------------------------------------------------------------- +Fri Nov 9 14:15:43 UTC 2018 - Fridrich Strba + +- Add two aliases to the maven artifact in + geronimo-annotation-1_0-api sub-package + +------------------------------------------------------------------- +Mon Jul 16 09:49:33 UTC 2018 - fstrba@suse.com + +- BuildConflict with java-devel >= 11, since the build uses tools + and APIs removed in jdk11 + +------------------------------------------------------------------- +Thu May 17 07:58:39 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility + +------------------------------------------------------------------- +Fri Sep 8 07:54:40 UTC 2017 - fstrba@suse.com + +- Specify java source and target version to 1.6 in order to allow + build with jdk9 +- Modified source: + * geronimo-specs.build.xml + - specify encoding UTF-8, since the files use UTF-8 characters + +------------------------------------------------------------------- +Fri May 19 14:33:51 UTC 2017 - tchvatal@suse.com + +- Remove javadoc to cut build time in half + +------------------------------------------------------------------- +Fri May 19 13:22:01 UTC 2017 - tchvatal@suse.com + +- Fix building with new javapackages-tools +- Remove unused conditionals + +------------------------------------------------------------------- +Wed Mar 18 09:46:07 UTC 2015 - tchvatal@suse.com + +- Fix build with new javapackages-tools + +------------------------------------------------------------------- +Tue Jul 29 11:26:17 UTC 2014 - tchvatal@suse.com + +- Do not mess with defattr as it is pointless. + +------------------------------------------------------------------- +Fri Jul 25 12:18:42 UTC 2014 - tchvatal@suse.com + +- Try to use the update-alternatives properly. + +------------------------------------------------------------------- +Mon Sep 9 11:05:41 UTC 2013 - tchvatal@suse.com + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Tue Sep 3 14:09:38 UTC 2013 - mvyskocil@suse.com + +- use add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- +Mon Dec 17 12:37:31 UTC 2012 - mvyskocil@suse.com + +- drop useless excalibur-avalon from build requires + +------------------------------------------------------------------- +Mon Sep 19 12:35:44 UTC 2011 - mvyskocil@suse.cz + +- fix a typo in alternatives --install call causing a build failure + +------------------------------------------------------------------- +Wed May 6 16:19:03 CEST 2009 - mvyskocil@suse.cz + +- Update to 1.2 + * bugfix release and update release + * JPA support. + * CA - Certificate Authority capabilities, you can now issue certificates in + reply to CSRs. See http://cwiki.apache.org/GMOxDOC12/certification-authority.html +- synchronized specfile with jpackage 5.0 + * mavenized + * obsoleted geronimo-specs-j2ee-management-pom.patch, + geronimo-specs-pom_xml.patch, geronimo-spec-javamail-sun-security.patch + * do not use triggers + * use alternatives system +- used one build.xml for all packages ==> shorter %%build section +- fdupes used on javadoc +- new packages + * geronimo-ws-metadata + * geronimo-stax-1_0-api + * geronimo-servlet-2_5 + * geronimo-jta-1_1-api + * geronimo-jsp-2_1-api + * geronimo-jpa-3_0-api + * geronimo-javamail-1_4-api + * geronimo-j2ee-management-1_1 + * geronimo-jacc-1_1-api + * geronimo-javaee-deployment + * geronimo-interceptor-3_0-api + * geronimo-el-1_0-api + * geronimo-ejb-3_0-api + * geronimo-annotation-1_0-api + * geronimo-jaf-1_1-api + * geronimo-specs-javadoc +- undot.py to remove dots from package names +- remove %%{release} from Requires + +------------------------------------------------------------------- +Mon Dec 1 10:58:58 CET 2008 - mvyskocil@suse.cz + +- added a Conflicts to gnu-jaf to geronimo-jav-1_0_2-api + +------------------------------------------------------------------- +Tue Aug 26 09:31:31 CEST 2008 - anosek@suse.cz + +- fixed path to LICENSE.txt files in spec + +------------------------------------------------------------------- +Mon Aug 25 11:47:57 CEST 2008 - mvyskocil@suse.cz + +- target=1.5 source=1.5 +- removed a gcj support +- fixed some rpmlint warnings + +------------------------------------------------------------------- +Tue Apr 22 00:53:09 CEST 2008 - ro@suse.de + +- changed requires of main package to use underscores as well + +------------------------------------------------------------------- +Thu Apr 17 09:12:41 CEST 2008 - mvyskocil@suse.cz + +- Dots in names was replaced by underscore +- Added a PreReq on coreutils +- Removed of BuildRoot removal in %install phase + +------------------------------------------------------------------- +Mon Apr 7 17:16:32 CEST 2008 - mvyskocil@suse.cz + +- First release in Suse (JPP 1.7) version 1.1 + - build dependency for log4j update [bnc#355798] + - added a build support using ant + - FIXME: the corba-3.0 package is not currently included + diff --git a/geronimo-specs.spec b/geronimo-specs.spec new file mode 100644 index 0000000..1267653 --- /dev/null +++ b/geronimo-specs.spec @@ -0,0 +1,467 @@ +# +# spec file for package geronimo-specs +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define bname geronimo +Name: geronimo-specs +Version: 1.2 +Release: 0 +Summary: Geronimo J2EE server J2EE specifications +License: Apache-2.0 +Group: Development/Languages/Java +URL: https://geronimo.apache.org +Source0: %{name}-%{version}-src.tar.xz +# STEPS TO CREATE THE SOURCE FILE +# mkdir geronimo-specs-1.2 +# cd geronimo-specs-1.2 +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-activation_1.0.2_spec-1.2/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-activation_1.1_spec-1.0/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-annotation_1.0_spec-1.1.0/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-connector_1.5_spec-1.1.1/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jaxrpc_1.1_spec-1.1/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jms_1.1_spec-1.1/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jpa_3.0_spec-1.1.0/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jta_1.0.1B_spec-1.1.1/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jta_1.1_spec-1.1.0/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-qname_1.1_spec-1.1/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-saaj_1.1_spec-1.1/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-servlet_2.4_spec-1.1.1/ +# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-servlet_2.5_spec-1.1/ +# # AND +# curl -O http://svn.apache.org/repos/asf/geronimo/specs/trunk/pom.xml +# curl -O http://svn.apache.org/repos/asf/geronimo/specs/trunk/LICENSE.txt +# curl -O http://svn.apache.org/repos/asf/geronimo/specs/trunk/NOTICE.txt +# curl -O http://svn.apache.org/repos/asf/geronimo/specs/trunk/README.txt +# +Source1000: geronimo-specs.build.xml +Source1001: undot.py +BuildRequires: ant +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local >= 6 +BuildArch: noarch + +%description +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications Note: You should use the subpackages for the +Specifications that you actually need. The ones installed by the main +package are deprecated and will disapear in future releases. + +%package -n geronimo-jaf-1_0_2-api +Summary: Geronimo Activation 1.0.2 Specification +Group: Development/Languages/Java +Requires(pre): update-alternatives +Provides: jaf = 1.0.2 +# TODO: drop asap +Provides: activation_1_0_2_api = %{version} +Provides: activation_api = 1.0.2 +Provides: jaf_1_0_2_api = %{version} +Provides: jaf_api = 1.0.2 +Obsoletes: %{name}-poms + +%description -n geronimo-jaf-1_0_2-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications: Java Activation Framework + +%package -n geronimo-jaf-1_1-api +Summary: Geronimo Activation 1.1 Specification +Group: Development/Languages/Java +Requires(pre): update-alternatives +Provides: jaf = 1.1 +# TODO: drop asap +Provides: activation_1_1_api = %{version} +Provides: activation_api = 1.1 +Provides: jaf_1_1_api = %{version} +Provides: jaf_api = 1.1 +Obsoletes: %{name}-poms + +%description -n geronimo-jaf-1_1-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications Note: You should use the subpackages for the +Specifications that you actually need. The ones installed by the main +package are deprecated and will disapear in future releases. + +%package -n geronimo-annotation-1_0-api +Summary: Geronimo Annotation 1.0 Specification +Group: Development/Languages/Java +Requires(pre): update-alternatives +Provides: annotation_1_0_api +Provides: annotation_api = 1.0 +Obsoletes: %{name}-poms + +%description -n geronimo-annotation-1_0-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications Note: You should use the subpackages for the +Specifications that you actually need. The ones installed by the main +package are deprecated and will disapear in future releases. + +%package -n geronimo-j2ee-connector-1_5-api +Summary: Geronimo J2EE server J2EE specifications +Group: Development/Languages/Java +Requires: jta_1_0_1B_api +Requires(pre): update-alternatives +Provides: j2ee_connector_1_5_api = %{version} +Provides: j2ee_connector_api = 1.5 +# drop the following asap +Provides: j2ee-connector = 1.5 +Obsoletes: %{name}-poms +Obsoletes: j2ee-connector + +%description -n geronimo-j2ee-connector-1_5-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications: J2EE Connector Architecture Specification + +%package -n geronimo-jaxrpc-1_1-api +Summary: Geronimo JAXRPC 1.1 Specification +Group: Development/Languages/Java +Requires: qname_1_1_api +Requires: saaj_1_1_api +Requires: servlet_2_4_api +Requires(pre): update-alternatives +Provides: jaxrpc = 1.1 +# TODO: drop asap +Provides: jaxrpc_1_1_api = %{version} +Provides: jaxrpc_api = 1.1 +Obsoletes: %{name}-poms + +%description -n geronimo-jaxrpc-1_1-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications: Java API for XML-Based RPC (JAXRPC) + +%package -n geronimo-jms-1_1-api +Summary: Geronimo JMS 1.1 Specification +Group: Development/Languages/Java +Requires(pre): update-alternatives +Provides: jms_1_1_api = %{version} +Provides: jms_api = 1.1 +# drop the following asap +Provides: jms = 1.1 +Obsoletes: %{name}-poms +Obsoletes: jms + +%description -n geronimo-jms-1_1-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications: JMS Specification + +%package -n geronimo-jpa-3_0-api +Summary: Geronimo JPA 1.0 Specification +Group: Development/Languages/Java +Requires(pre): update-alternatives +Provides: jpa_3_0_api = %{version} +Provides: jpa_api = 3.0 +Obsoletes: %{name}-poms + +%description -n geronimo-jpa-3_0-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications Note: You should use the subpackages for the +Specifications that you actually need. The ones installed by the main +package are deprecated and will disapear in future releases. + +%package -n geronimo-jta-1_0_1B-api +Summary: Geronimo JTA 1.0.1B Specification +Group: Development/Languages/Java +Requires(pre): update-alternatives +Provides: jta_1_0_1B_api = %{version} +Provides: jta_api = 1.0.1B +# drop the following asap +Provides: jta = 1.0.1B +Obsoletes: %{name}-poms + +%description -n geronimo-jta-1_0_1B-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications: Java Transaction API Specification + +%package -n geronimo-jta-1_1-api +Summary: Geronimo JTA 1.1 Specification +Group: Development/Languages/Java +Requires(pre): update-alternatives +Provides: jta_1_1_api = %{version} +Provides: jta_api = 1.1 +# drop the following asap +Provides: jta = 1.1 +Obsoletes: %{name}-poms + +%description -n geronimo-jta-1_1-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications Note: You should use the subpackages for the +Specifications that you actually need. The ones installed by the main +package are deprecated and will disapear in future releases. + +%package -n geronimo-qname-1_1-api +Summary: Geronimo QName 1.1 Specification +Group: Development/Languages/Java +Requires(pre): update-alternatives +Provides: qname_1_1_api = %{version} +Provides: qname_api = 1.1 +Obsoletes: %{name}-poms + +%description -n geronimo-qname-1_1-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications: javax.xml.namespace.QName API + +%package -n geronimo-saaj-1_1-api +Summary: Geronimo SAAJ 1.1 Specification +Group: Development/Languages/Java +Requires: jaf_1_0_2_api +Requires(pre): update-alternatives +Provides: saaj = 1.1 +# TODO: drop asap +Provides: saaj_1_1_api = %{version} +Provides: saaj_api = 1.1 +Obsoletes: %{name}-poms + +%description -n geronimo-saaj-1_1-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications: SOAP with Attachments API for Java (SAAJ) + +%package -n geronimo-servlet-2_4-api +Summary: Geronimo Servlet 2.4 Specification +Group: Development/Languages/Java +Requires(pre): update-alternatives +Provides: servlet = 2.4 +# TODO: drop asap +Provides: servlet_2_4_api = %{version} +Provides: servlet_api = 2.4 +Obsoletes: %{name}-poms + +%description -n geronimo-servlet-2_4-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications: J2EE Servlet v2.4 API + +%package -n geronimo-servlet-2_5-api +Summary: Geronimo Servlet 2.5 Specification +Group: Development/Languages/Java +Requires(pre): update-alternatives +Provides: servlet = 2.5 +# TODO: drop asap +Provides: servlet_2_5_api = %{version} +Provides: servlet_api = 2.5 +Obsoletes: %{name}-poms + +%description -n geronimo-servlet-2_5-api +Geronimo is Apache's ASF-licenced J2EE server project. These are the +J2EE-Specifications Note: You should use the subpackages for the +Specifications that you actually need. The ones installed by the main +package are deprecated and will disapear in future releases. + +%prep +%setup -q +chmod -R go=u-w * +cp %{SOURCE1000} build.xml + +%build +%{ant} -Dant.build.javac.source=8 -Dant.build.javac.target=8 + +%install +set +x +# Directory for poms +install -d -m 0755 %{buildroot}/%{_mavenpomdir} +# subpackage jars +install -d -m 755 %{buildroot}%{_javadir} +install -m 0644 \ + geronimo-activation_1.0.2_spec-1.2/target/geronimo-activation_1.0.2_spec-1.2.jar \ + %{buildroot}%{_javadir}/geronimo-jaf-1.0.2-api.jar +%{mvn_install_pom} geronimo-activation_1.0.2_spec-1.2/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaf-1.0.2-api.pom +%add_maven_depmap JPP-geronimo-jaf-1.0.2-api.pom geronimo-jaf-1.0.2-api.jar -f jaf-1.0.2-api + +install -m 0644 \ + geronimo-activation_1.1_spec-1.0/target/geronimo-activation_1.1_spec-1.0.jar \ + %{buildroot}%{_javadir}/geronimo-jaf-1.1-api.jar +%{mvn_install_pom} geronimo-activation_1.1_spec-1.0/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaf-1.1-api.pom +%add_maven_depmap JPP-geronimo-jaf-1.1-api.pom geronimo-jaf-1.1-api.jar -f jaf-1.1-api + +install -m 0644 \ + geronimo-annotation_1.0_spec-1.1.0/target/geronimo-annotation_1.0_spec-1.1.jar \ + %{buildroot}%{_javadir}/geronimo-annotation-1.0-api.jar +%{mvn_install_pom} geronimo-annotation_1.0_spec-1.1.0/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-annotation-1.0-api.pom +%add_maven_depmap JPP-geronimo-annotation-1.0-api.pom geronimo-annotation-1.0-api.jar -a "javax.annotation:jsr250-api,org.eclipse.jetty.orbit:javax.annotation" -f annotation-1.0-api + +install -m 0644 \ + geronimo-j2ee-connector_1.5_spec-1.1.1/target/geronimo-j2ee-connector_1.5_spec-1.1.1.jar \ + %{buildroot}%{_javadir}/geronimo-j2ee-connector-1.5-api.jar +%{mvn_install_pom} geronimo-j2ee-connector_1.5_spec-1.1.1/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-connector-1.5-api.pom +%add_maven_depmap JPP-geronimo-j2ee-connector-1.5-api.pom geronimo-j2ee-connector-1.5-api.jar -f j2ee-connector-1.5-api + +install -m 0644 \ + geronimo-jaxrpc_1.1_spec-1.1/target/geronimo-jaxrpc_1.1_spec-1.1.jar \ + %{buildroot}%{_javadir}/geronimo-jaxrpc-1.1-api.jar +%{mvn_install_pom} geronimo-jaxrpc_1.1_spec-1.1/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaxrpc-1.1-api.pom +%add_maven_depmap JPP-geronimo-jaxrpc-1.1-api.pom geronimo-jaxrpc-1.1-api.jar -f jaxrpc-1.1-api + +install -m 0644 \ + geronimo-jms_1.1_spec-1.1/target/geronimo-jms_1.1_spec-1.1.jar \ + %{buildroot}%{_javadir}/geronimo-jms-1.1-api.jar +%{mvn_install_pom} geronimo-jms_1.1_spec-1.1/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jms-1.1-api.pom +%add_maven_depmap JPP-geronimo-jms-1.1-api.pom geronimo-jms-1.1-api.jar -f jms-1.1-api -a javax.jms:jms + +install -m 0644 \ + geronimo-jpa_3.0_spec-1.1.0/target/geronimo-jpa_3.0_spec-1.1.jar \ + %{buildroot}%{_javadir}/geronimo-jpa-3.0-api.jar +%{mvn_install_pom} geronimo-jpa_3.0_spec-1.1.0/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jpa-3.0-api.pom +%add_maven_depmap JPP-geronimo-jpa-3.0-api.pom geronimo-jpa-3.0-api.jar -f jpa-3.0-api -a javax.persistence:persistence-api + +install -m 0644 \ + geronimo-jta_1.0.1B_spec-1.1.1/target/geronimo-jta_1.0.1B_spec-1.1.1.jar \ + %{buildroot}%{_javadir}/geronimo-jta-1.0.1B-api.jar +%{mvn_install_pom} geronimo-jta_1.0.1B_spec-1.1.1/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jta-1.0.1B-api.pom +%add_maven_depmap JPP-geronimo-jta-1.0.1B-api.pom geronimo-jta-1.0.1B-api.jar -f jta-1.0.1B-api + +install -m 0644 \ + geronimo-jta_1.1_spec-1.1.0/target/geronimo-jta_1.1_spec-1.1.jar \ + %{buildroot}%{_javadir}/geronimo-jta-1.1-api.jar +%{mvn_install_pom} geronimo-jta_1.1_spec-1.1.0/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jta-1.1-api.pom +%add_maven_depmap JPP-geronimo-jta-1.1-api.pom geronimo-jta-1.1-api.jar -f jta-1.1-api -a "javax.transaction:jta,org.eclipse.jetty.orbit:javax.transaction" + +install -m 0644 \ + geronimo-qname_1.1_spec-1.1/target/geronimo-qname_1.1_spec-1.1.jar \ + %{buildroot}%{_javadir}/geronimo-qname-1.1-api.jar +%{mvn_install_pom} geronimo-qname_1.1_spec-1.1/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-qname-1.1-api.pom +%add_maven_depmap JPP-geronimo-qname-1.1-api.pom geronimo-qname-1.1-api.jar -f qname-1.1-api + +install -m 0644 \ + geronimo-saaj_1.1_spec-1.1/target/geronimo-saaj_1.1_spec-1.1.jar \ + %{buildroot}%{_javadir}/geronimo-saaj-1.1-api.jar +%{mvn_install_pom} geronimo-saaj_1.1_spec-1.1/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-saaj-1.1-api.pom +%add_maven_depmap JPP-geronimo-saaj-1.1-api.pom geronimo-saaj-1.1-api.jar -f saaj-1.1-api + +install -m 0644 \ + geronimo-servlet_2.4_spec-1.1.1/target/geronimo-servlet_2.4_spec-1.1.1.jar \ + %{buildroot}%{_javadir}/geronimo-servlet-2.4-api.jar +%{mvn_install_pom} geronimo-servlet_2.4_spec-1.1.1/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-servlet-2.4-api.pom +%add_maven_depmap JPP-geronimo-servlet-2.4-api.pom geronimo-servlet-2.4-api.jar -f servlet-2.4-api + +install -m 0644 \ + geronimo-servlet_2.5_spec-1.1/target/geronimo-servlet_2.5_spec-1.1.jar \ + %{buildroot}%{_javadir}/geronimo-servlet-2.5-api.jar +%{mvn_install_pom} geronimo-servlet_2.5_spec-1.1/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-servlet-2.5-api.pom +%add_maven_depmap JPP-geronimo-servlet-2.5-api.pom geronimo-servlet-2.5-api.jar -f servlet-2.5-api + +%pre -n geronimo-jaf-1_0_2-api +update-alternatives --remove jaf %{_javadir}/geronimo-jaf-1.0.2-api.jar +update-alternatives --remove jaf_api %{_javadir}/geronimo-jaf-1.0.2-api.jar +update-alternatives --remove jaf_1_0_2_api %{_javadir}/geronimo-jaf-1.0.2-api.jar + +%pre -n geronimo-jaf-1_1-api +update-alternatives --remove jaf %{_javadir}/geronimo-jaf-1.1-api.jar +update-alternatives --remove jaf_api %{_javadir}/geronimo-jaf-1.1-api.jar +update-alternatives --remove jaf_1_1_api %{_javadir}/geronimo-jaf-1.1-api.jar + +%pre -n geronimo-annotation-1_0-api +update-alternatives --remove annotation_api %{_javadir}/geronimo-annotation-1.0-api.jar +update-alternatives --remove annotation_1_0_api %{_javadir}/geronimo-annotation-1.0-api.jar + +%pre -n geronimo-j2ee-connector-1_5-api +update-alternatives --remove j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar +update-alternatives --remove j2ee_connector_api %{_javadir}/geronimo-j2ee-connector-1.5-api.jar +update-alternatives --remove j2ee_connector_1_5_api %{_javadir}/geronimo-j2ee-connector-1.5-api.jar + +%pre -n geronimo-jaxrpc-1_1-api +update-alternatives --remove jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar +update-alternatives --remove jaxrpc_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar +update-alternatives --remove jaxrpc_1_1_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar + +%pre -n geronimo-jms-1_1-api +update-alternatives --remove jms %{_javadir}/geronimo-jms-1.1-api.jar +update-alternatives --remove jms_api %{_javadir}/geronimo-jms-1.1-api.jar +update-alternatives --remove jms_1_1_api %{_javadir}/geronimo-jms-1.1-api.jar + +%pre -n geronimo-jpa-3_0-api +update-alternatives --remove jpa_api %{_javadir}/geronimo-jpa-3.0-api.jar +update-alternatives --remove jpa_3_0_api %{_javadir}/geronimo-jpa-3.0-api.jar + +%pre -n geronimo-jta-1_0_1B-api +update-alternatives --remove jta %{_javadir}/geronimo-jta-1.0.1B-api.jar +update-alternatives --remove jta_api %{_javadir}/geronimo-jta-1.0.1B-api.jar +update-alternatives --remove jta_1_0_1B_api %{_javadir}/geronimo-jta-1.0.1B-api.jar + +%pre -n geronimo-jta-1_1-api +update-alternatives --remove jta %{_javadir}/geronimo-jta-1.1-api.jar +update-alternatives --remove jta_api %{_javadir}/geronimo-jta-1.1-api.jar +update-alternatives --remove jta_1_1_api %{_javadir}/geronimo-jta-1.1-api.jar + +%pre -n geronimo-qname-1_1-api +update-alternatives --remove qname_api %{_javadir}/geronimo-qname-1.1-api.jar +update-alternatives --remove qname_1_1_api %{_javadir}/geronimo-qname-1.1-api.jar + +%pre -n geronimo-saaj-1_1-api +update-alternatives --remove saaj %{_javadir}/geronimo-saaj-1.1-api.jar +update-alternatives --remove saaj_api %{_javadir}/geronimo-saaj-1.1-api.jar +update-alternatives --remove saaj_1_1_api %{_javadir}/geronimo-saaj-1.1-api.jar + +%pre -n geronimo-servlet-2_4-api +update-alternatives --remove servlet %{_javadir}/geronimo-servlet-2.4-api.jar +update-alternatives --remove servlet_api %{_javadir}/geronimo-servlet-2.4-api.jar +update-alternatives --remove servlet_2_4_api %{_javadir}/geronimo-servlet-2.4-api.jar + +%pre -n geronimo-servlet-2_5-api +update-alternatives --remove servlet %{_javadir}/geronimo-servlet-2.5-api.jar +update-alternatives --remove servlet_api %{_javadir}/geronimo-servlet-2.5-api.jar +update-alternatives --remove servlet_2_5_api %{_javadir}/geronimo-servlet-2.5-api.jar + +%files -n geronimo-jaf-1_0_2-api -f .mfiles-jaf-1.0.2-api +%license geronimo-activation_1.0.2_spec-1.2/LICENSE.txt + +%files -n geronimo-jaf-1_1-api -f .mfiles-jaf-1.1-api +%license geronimo-activation_1.1_spec-1.0/LICENSE.txt + +%files -n geronimo-annotation-1_0-api -f .mfiles-annotation-1.0-api +%license geronimo-annotation_1.0_spec-1.1.0/LICENSE.txt + +%files -n geronimo-j2ee-connector-1_5-api -f .mfiles-j2ee-connector-1.5-api +%license geronimo-j2ee-connector_1.5_spec-1.1.1/LICENSE.txt + +%files -n geronimo-jaxrpc-1_1-api -f .mfiles-jaxrpc-1.1-api +%license geronimo-jaxrpc_1.1_spec-1.1/LICENSE.txt + +%files -n geronimo-jms-1_1-api -f .mfiles-jms-1.1-api +%license geronimo-jms_1.1_spec-1.1/LICENSE.txt + +%files -n geronimo-jpa-3_0-api -f .mfiles-jpa-3.0-api +%license geronimo-jpa_3.0_spec-1.1.0/LICENSE.txt + +%files -n geronimo-jta-1_0_1B-api -f .mfiles-jta-1.0.1B-api +%license geronimo-jta_1.0.1B_spec-1.1.1/LICENSE.txt + +%files -n geronimo-jta-1_1-api -f .mfiles-jta-1.1-api +%license geronimo-jta_1.1_spec-1.1.0/LICENSE.txt + +%files -n geronimo-qname-1_1-api -f .mfiles-qname-1.1-api +%license geronimo-qname_1.1_spec-1.1/LICENSE.txt + +%files -n geronimo-saaj-1_1-api -f .mfiles-saaj-1.1-api +%license geronimo-saaj_1.1_spec-1.1/LICENSE.txt + +%files -n geronimo-servlet-2_4-api -f .mfiles-servlet-2.4-api +%license geronimo-servlet_2.4_spec-1.1.1/LICENSE.txt + +%files -n geronimo-servlet-2_5-api -f .mfiles-servlet-2.5-api +%license geronimo-servlet_2.5_spec-1.1/LICENSE.txt + +%changelog diff --git a/undot.py b/undot.py new file mode 100644 index 0000000..f536ef2 --- /dev/null +++ b/undot.py @@ -0,0 +1,25 @@ +#!/usr/bin/python + +# remove dots from package names, as they are not allowed in SUSE +# +# Usage: +# cat geronimo-specs.spec | ./undot.py > geronimo-specs.new.spec +# gvimdiff geronimo-specs.spec geronimo-specs.new.spec # review + +import re +import sys + +regexp = re.compile(r'^(Requires|%package|%description|%post|%postun|%pre|%preun|%files|BuildRequires|PreReq|Provides).*') +oregexp = re.compile(r'[<=>]') + +for line in sys.stdin: + + if regexp.search(line): + m = oregexp.search(line) + if m: + line = line[:m.start()].replace('.', '_') + line[m.start():] + else: + line = line.replace('.', '_') + + sys.stdout.write(line) +