rpms/geronimo-specs/F-12 geronimo-specs.spec, 1.25, 1.26 sources, 1.3, 1.4
Jeff Johnston
jjohnstn at fedoraproject.org
Tue Jan 19 21:25:05 UTC 2010
Author: jjohnstn
Update of /cvs/pkgs/rpms/geronimo-specs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1107
Modified Files:
geronimo-specs.spec sources
Log Message:
* Tue Jan 19 2010 Jeff Johnston <jjohnstn at redhat.com> - 0:1.0-3.2.M2
- Switch to noarch by default.
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.25 -r 1.26 geronimo-specs.specIndex: geronimo-specs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geronimo-specs/F-12/geronimo-specs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- geronimo-specs.spec 24 Jul 2009 23:53:46 -0000 1.25
+++ geronimo-specs.spec 19 Jan 2010 21:25:04 -0000 1.26
@@ -1,3453 +1,210 @@
-# Copyright (c) 2000-2009, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+%define bname geronimo
+%define mstone M2
-%bcond_with gcj_support
-%bcond_without tests
+%define _without_gcj_support 1
-%if %with gcj_support
-%define gcj_support 1
-%else
-%define gcj_support 0
-%endif
-
-%define bname geronimo
-%define section free
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define sver_activation_1_0_2 1.2
-%define sver_activation_1_1 1.0
-%define sver_annotation_1_0 1.1.0
-%define sver_corba_1_0 1.0
-%define sver_corba_2_3 1.1
-%define sver_corba_3_0 1.1
-%define sver_ejb_2_1 1.1
-%define sver_ejb_3_0 1.0
-%define sver_el_1_0 1.0
-%define sver_interceptor_3_0 1.0
-%define sver_j2ee_connector_1_5 1.1.1
-%define sver_j2ee_deployment_1_1 1.1
-%define sver_javaee_deployment_1_1MR3 1.0
-%define sver_j2ee_jacc_1_0 1.1
-%define sver_jacc_1_1 1.0
-%define sver_j2ee_management_1_0 1.1
-%define sver_j2ee_management_1_1 1.0
-%define sver_javamail_1_3_1 1.3
-%define sver_javamail_1_4 1.1
-%define sver_jaxr_1_0 1.1
-%define sver_jaxrpc_1_1 1.1
-%define sver_jms_1_1 1.1
-%define sver_jpa_3_0 1.1.0
-%define sver_jsp_2_0 1.1
-%define sver_jsp_2_1 1.0
-%define sver_jta_1_0_1B 1.1.1
-%define sver_jta_1_1 1.1.0
-%define sver_qname_1_1 1.1
-%define sver_saaj_1_1 1.1
-%define sver_servlet_2_4 1.1.1
-%define sver_servlet_2_5 1.1
-%define sver_stax_1_0 1.0
-%define sver_ws_metadata_2_0 1.1.1
-%define sver_commonj_1_1 1.0
+%define section free
Summary: Geronimo J2EE server J2EE specifications
-URL: http://geronimo.apache.org/
+URL: http://geronimo.apache.org
+Source0: %{bname}-%{version}-%{mstone}-src.tar.gz
+
Name: geronimo-specs
-Version: 1.2
-Release: 14.1%{?dist}
+Version: 1.0
+Release: 3.2.M2%{?dist}
Epoch: 0
License: ASL 2.0
-Group: Development/Libraries/Java
-Source0: %{name}-%{version}-src.tar.gz
-# 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-ejb_2.1_spec-1.1/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-ejb_3.0_spec-1.0/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-el_1.0_spec-1.0/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-interceptor_3.0_spec-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-j2ee-deployment_1.1_spec-1.1/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-jacc_1.0_spec-1.1/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-management_1.0_spec-1.1/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-management_1.1_spec-1.0/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jacc_1.1_spec-1.0/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javaee-deployment_1.1MR3_spec-1.0/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javamail_1.3.1_spec-1.3/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javamail_1.4_spec-1.1/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jaxr_1.0_spec-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-jsp_2.0_spec-1.1/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jsp_2.1_spec-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/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-stax-api_1.0_spec-1.0/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-ws-metadata_2.0_spec-1.1.1/
-# # AND FOR COMPLETENESS
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/1_1_1/geronimo-spec-commonj/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/1_1_1/geronimo-spec-corba/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/1_1_1/geronimo-spec-corba-2.3/
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/1_1_1/geronimo-spec-corba-3.0/
-# # AS WELL AS
-# svn export http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/
-# # 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
-#
-
-Source1: %{name}-jpp-depmap.xml
-Source2: %{name}-settings.xml
-
-Patch0: geronimo-specs-1.2-pom_xml.patch
-Patch1: geronimo-specs-jta-1.0.1B-pom_xml.patch
-Patch2: geronimo-specs-j2ee-connector-1.5-pom_xml.patch
-Patch3: geronimo-specs-servlet-2.4-pom_xml.patch
-Patch4: geronimo-specs-j2ee-1.4-pom_xml.patch
-Patch5: geronimo-specs-corba-2.3-pom_xml.patch
-Patch6: geronimo-specs-pom-version.patch
-
-BuildConflicts: geronimo-specs
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-shared-common-artifact-filters
-BuildRequires: maven-shared-repository-builder
-%if %with tests
-BuildRequires: maven-surefire-provider-junit
-%endif
-
-BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: java-devel >= 0:1.5.0
-BuildRequires: maven2 >= 0:2.0.4
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven-shared-file-management
-BuildRequires: sed
-BuildRequires: saxon
-BuildRequires: saxon-scripts
-# TODO: USE org.apache.geronimo.genesis.plugins:tools-maven-plugin
-# TODO: USE org.apache.felix:maven-bundle-plugin
-
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-one
-BuildRequires: maven-release
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire
-BuildRequires: excalibur-avalon-framework
-BuildRequires: excalibur-avalon-logkit
-BuildRequires: mojo-maven2-plugin-idlj
-BuildRequires: jacorb >= 0:2.3.0-17
[...3214 lines suppressed...]
-%doc %{_docdir}/%{name}-%{version}/stax-1.0/LICENSE.txt
-%ghost %{_javadir}/stax_api.jar
-%ghost %{_javadir}/stax_1_0_api.jar
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-stax-1.0-api-%{version}.jar.*
-%endif
+* Wed Jun 29 2005 Gary Benson <gbenson at redhat.com> 0:1.0-0.M2.2jpp_3fc
+- Add dependency on the main package to the compatibility subpackage.
-%files -n geronimo-ws-metadata-2.0-api
-%defattr(0644,root,root,0755)
-%{_javadir}/geronimo-ws-metadata-2.0-api*.jar
-%doc %{_docdir}/%{name}-%{version}/ws-metadata-2.0/LICENSE.txt
-%ghost %{_javadir}/ws_metadata_api.jar
-%ghost %{_javadir}/ws_metadata_2_0_api.jar
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-ws-metadata-2.0-api-%{version}.jar.*
-%endif
+* Mon Jun 27 2005 Gary Benson <gbenson at redhat.com> 0:1.0-0.M2.2jpp_2fc
+- BC-compile.
-%changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2-14.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:1.0-0.M2.2jpp_1fc
+- Build into Fedora.
-* Fri Mar 20 2009 David Walluck <dwalluck at redhat.com> 0:1.2-13.1
-- enable tests
-- correctly define gcj_support
-- add BuildConflicts: geronimo-specs
-- add missing maven2-2.0.8 BuildRequires
-- add patch for versions
-- correctly define versions
-- use %%{jar} macro
-
-* Fri Mar 20 2009 Ralph Apel <r.apel at r-apel.de> 0:1.2-13
-- Give the alternatives provided by -j2ee-1.4-apis a very low prio
-- Fix creation of -j2ee-1.4-apis jar file
-- Omit excessive (conflicting) Obsoletes
-
-* Wed Mar 11 2009 Ralph Apel <r.apel at r-apel.de> 0:1.2-12
-- Drop BR itself
-
-* Fri Oct 10 2008 David Walluck <dwalluck at redhat.com> 0:1.2-11
-- change Conflicts: geronimo-specs-compat to Obsoletes
-
-* Mon Sep 22 2008 David Walluck <dwalluck at redhat.com> 0:1.2-10
-- add Conflicts: geronimo-specs-compat
-
-* Mon Sep 22 2008 David Walluck <dwalluck at redhat.com> 0:1.2-9
-- fix build
-- add avalon-framework to maven depmap
-
-* Mon Sep 08 2008 David Walluck <dwalluck at redhat.com> 0:1.2-8
-- fix build under JDK6
-
-* Thu Aug 07 2008 David Walluck <dwalluck at redhat.com> 0:1.2-7
-- geronimo-j2ee-1.4-apis should have j2ee-conenctor alternative
-
-* Thu Aug 07 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.2-6.jpp5
-- Fix geronimo-j2ee-1.4-apis jar file (maven2-plugin-assembly usage)
-- BR jacorb >= 0:2.3.0-11
-
-* Wed Jul 16 2008 David Walluck <dwalluck at redhat.com> 0:1.2-5
-- remove excalibur/avalon-logkit from CLASSPATH
-
-* Thu Jul 10 2008 David Walluck <dwalluck at redhat.com> 0:1.2-4
-- conditionalize tests
-
-* Thu Jul 10 2008 David Walluck <dwalluck at redhat.com> 0:1.2-3
-- use %%{_sbindir} macro
-- fix GCJ support
-- fix poms directory ownership
-- remove spurious gnu-crypto dependency
-- use more strict permissions
-- update License
-- update BuildRoot
-- update Release
-- remove Vendor and Distribution
-
-* Fri Nov 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-2jpp
-- Reenter legacy provides (without _): should be dropped asap
-- Introduced dependencies between apis
-
-* Tue Oct 23 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
-- Upgrade to 1.2 (extended)
-- Rename virtual capabilities
-- Commented out the triggers for now
-
-* Thu May 31 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.1-4jpp
-- Fix aot build
-- Drop false Requires: wsdl4j for -qname-1.1-api
-- Create alternative for qname.jar
-
-* Sun Feb 25 2007 Deepak Bhole <dbhole at redhat.com> - 0:1.1-3jpp
-- Rebuilding
-
-* Mon Feb 19 2007 Deepak Bhole <dbhole at redhat.com> - 0:1.1-2jpp
-- Update for new maven2
-
-* Mon Sep 25 2006 Ralph Apel <r.apel at r-apel.de> 0:1.1-1jpp
-- Upgrade to 1.1
-- Add post/postun Requires for javadoc
-- Add gcj_support option
-- Now build with maven2
-- Add corba, corba-3.0 subpackages
-- Add commonj subpackage
-- geronimo-jaf-1.0.2-api should not obsolete jaf, as this is
- also provided by classpathx-jaf: TODO: we need a conflict free
- specs naming scheme
-- build geronimo-spec-j2ee separately: no javadoc:javadoc to build
-
-* Tue Mar 07 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0-3jpp
-- Patch JACC to fix EJBMethodPermission wrong signature problem
-
-* Tue Feb 14 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0-2jpp
-- Revert renaming of geronimo-jacc to geronimo-j2ee-jacc
-
-* Mon Feb 13 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0-1jpp
-- Upgrade to 1.0 final
-- Renamed geronimo-jacc to geronimo-j2ee-jacc
-- Generate most of project.xml files by xsl
-
-* Thu Dec 22 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp
-- First JPP 1.7 build
-- Add missing build dependency on maven-plugin-multiproject
-
-* Fri Dec 02 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp_10rh
-- Require update-alternatives in the subpackages that actually use it.
-
-* Mon Nov 21 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp_9rh
-- Do not add/remove javamail alternatives either.
-
-* Thu Nov 17 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp_8rh
-- Do not provide 'javamail' as this is just the API (is it?) and
- our 'javamail' alternative means the providers as well
- all in a single jar file called 'javamail.jar'
-
-* Tue Nov 15 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp_7rh
-- Handle replacement of jaf alternative
-- Remove leading zeroes from alternative priorities
-
-* Tue Nov 08 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp_6rh
-- New 6-digit JPP alternative priorities
-- Main package has links and requires subpackages
-
-* Wed Nov 02 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp_5rh
-- Add Obsoletes to non-free packages and add versions to Provides
-- Remove file from old non-free packages using a trigger
-- Remove alternatives in preun instead of postun
-- Require update-alternatives in preun and post
-- Own alternatives links by ghost
-
-* Sat Oct 22 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp_4rh
-- Add dash to j2ee-schema jar and link names
-
-* Sat Oct 22 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp_3rh
-- Fix broken link to j2ee-schema jar
-
-* Mon Aug 15 2005 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.M4.1jpp_2rh
-- Update dependencies
-- Remove code to build repository; depmap handles this now
-
-* Tue Aug 09 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp_1rh
-- Merge with upstream
-
-* Tue Aug 09 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M4.1jpp
-- Upgrade to M4
-
-* Tue Aug 09 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M2.3jpp_1rh
-- Merge with upstream
-
-* Thu Jun 01 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M2.3jpp
-- Add missing dependency on isorelax
-- Set JAVA_HOME
-- Rename pom files to prevent conflict with similar files from other packages
-
-* Thu Apr 28 2005 Fernando Nasser <fnasser at redhat.com> 0:1.0-0.M2.2jpp_1rh
-- First Red Hat build
-- Add missing build requires for jakarta-commons-jelly-tags-xml and forehead
-- Add missing build requires for maven-plugins-base
-- Use unversioned maven directory and require version >= 1.0.2
+* Fri Jun 3 2005 Gary Benson <gbenson at redhat.com>
+- Only build the bits that we need, and don't use Maven to do it.
+- Add a compatibility subpackage to provide dependencies.
+- Add NOTICE file as per Apache License version 2.0.
* Thu Feb 03 2005 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.M2.2jpp
- Process project.xml files with saxon
@@ -3456,6 +213,7 @@ fi
* Fri Oct 08 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.M2.1jpp
- Upgrade to M2
+
* Thu Sep 30 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.M1.1jpp
- First JPackage build
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geronimo-specs/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 7 May 2009 19:14:51 -0000 1.3
+++ sources 19 Jan 2010 21:25:04 -0000 1.4
@@ -1 +1 @@
-dc19acd6f91cc9b477b75ecb0b8e2a87 geronimo-specs-1.2-src.tar.gz
+37ff8a0ae6a3f7f0e9a0ec560529d4e3 geronimo-1.0-M2-src.tar.gz
More information about the scm-commits
mailing list