packages (JPACKAGE): maven/maven.spec - dropped all gcj stuff, we don't wan...
pawelz
pawelz at pld-linux.org
Tue Apr 27 18:17:01 CEST 2010
Author: pawelz Date: Tue Apr 27 16:17:01 2010 GMT
Module: packages Tag: JPACKAGE
---- Log message:
- dropped all gcj stuff, we don't want to support it
- dropped all NONFREE stuff, we don't want to support it
- dropped macros not needed in PLD
- removed JPP license info. It is already available in LICENSE.jpackage file.
---- Files affected:
packages/maven:
maven.spec (1.18.2.1 -> 1.18.2.2)
---- Diffs:
================================================================
Index: packages/maven/maven.spec
diff -u packages/maven/maven.spec:1.18.2.1 packages/maven/maven.spec:1.18.2.2
--- packages/maven/maven.spec:1.18.2.1 Tue Apr 27 18:06:29 2010
+++ packages/maven/maven.spec Tue Apr 27 18:16:55 2010
@@ -1,39 +1,3 @@
-# Copyright (c) 2000-2005, 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}}
-
-%bcond_with gcj_support
%bcond_with itests
%bcond_without bootstrap
%bcond_without repolib
@@ -42,14 +6,7 @@
%define repodirlib %{repodir}/lib
%define repodirsrc %{repodir}/src
-%if %with gcj_support
-%define gcj_support 1
-%else
-%define gcj_support 0
-%endif
-
%define maven_version 2.0.8
-%define NONFREE 0
%define base_name maven
%define name maven2
@@ -159,9 +116,6 @@
BuildRequires: checkstyle4 >= 4.1
BuildRequires: checkstyle4-optional >= 4.1
BuildRequires: classworlds >= 1.1
-%if %{NONFREE}
-BuildRequires: clover
-%endif
BuildRequires: dom4j >= 1.6.1
#BuildRequires: tomcat5-parent
BuildRequires: tomcat5-servlet-2.4-api
@@ -269,9 +223,6 @@
Requires: checkstyle4 >= 4.1
Requires: classworlds >= 1.
Requires(post): classworlds >= 1.1
-%if %{NONFREE}
-Requires: clover
-%endif
Requires: dom4j >= 1.6.1
#Requires: tomcat5-parent
Requires: tomcat5-servlet-2.4-api
@@ -354,15 +305,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description
Maven is a software project management and comprehension tool. Based on the
@@ -400,12 +343,6 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-ant
Generates an Ant build file for the project.
@@ -423,12 +360,6 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-antlr
Generates sources from an Antlr grammar.
@@ -441,12 +372,6 @@
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
Requires: maven-shared-reporting-impl
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-antrun
Runs a set of ant tasks from a phase of the build.
@@ -474,12 +399,6 @@
Requires: saxpath
Requires: junit >= 3.8.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-assembly
Builds an assembly (distribution) of sources and/or binaries.
@@ -496,12 +415,6 @@
Requires: maven-scm >= 0:1.0-0.b3.2
Requires: maven-shared-reporting-impl
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-changelog
The Maven Changelog Plugin generates reports regarding the recent changes in
your Software Configuration Management or SCM.
@@ -524,13 +437,6 @@
Requires: velocity
Requires: maven-shared-reporting-impl
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-changes
The Maven Changes Plugin is used to inform users of the changes that have
occured between different releases of your project.
@@ -547,12 +453,6 @@
Requires: plexus-resources
Requires: maven-shared-reporting-impl
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-checkstyle
Generates a checkstyle report.
@@ -565,40 +465,9 @@
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
Requires: plexus-utils >= 1.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-clean
Cleans up files generated during build.
-%if %{NONFREE}
-%package plugin-clover
-Summary: Clover plugin for maven
-Group: Development/Build Tools
-Requires: ant >= 1.6.5
-Requires: jmock >= 1.0.1
-Requires: junit >= 3.8.2
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires: plexus-compiler >= 1.5.1
-Requires: plexus-resources
-Requires: clover
-Requires: maven-shared-reporting-impl
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
-%description plugin-clover
-Generates a Clover report.
-%endif
-
-
%package plugin-compiler
Summary: Compiler plugin for maven
Group: Development/Build Tools
@@ -607,16 +476,9 @@
Requires: plexus-compiler >= 1.5.1
Requires: plexus-utils >= 1.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-compiler
Compiles Java sources.
-
%package plugin-dependency
Summary: Dependency plugin for maven
Group: Development/Build Tools
@@ -630,12 +492,6 @@
Requires: maven-shared-dependency-analyzer
Requires: maven-shared-dependency-tree
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-dependency
The dependency plugin provides the capability to manipulate artifacts. It can
copy and/or unpack artifacts from local or remote repositories to a specified
@@ -647,12 +503,6 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-deploy
Deploys the built artifacts to a remote repository.
@@ -664,12 +514,6 @@
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
Requires: plexus-utils
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-doap
The Maven DOAP Plugin generates a Description of a Project (DOAP) file from
a POM.
@@ -689,12 +533,6 @@
Requires: maven-shared-plugin-tools-api
Requires: maven-shared-reporting-impl
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-docck
The Maven DOCCK Plugin checks that a project complies with the
Plugin Documentation Standard.
@@ -709,12 +547,6 @@
Requires: maven-shared-verifier
Requires: xmlunit
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-ear
Generates an EAR from the current project.
@@ -735,12 +567,6 @@
Requires: maven-shared-test-tools
Requires: aqute-bndlib
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-eclipse
Generates an Eclipse project file for the current project.
@@ -751,12 +577,6 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-ejb
Builds an EJB (and optional client) from the current project.
@@ -771,12 +591,6 @@
Requires: jakarta-commons-lang
Requires: junit >= 3.8.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-gpg
The Maven GPG Plugin signs all of the project's attached artifacts with GnuPG.
@@ -788,12 +602,6 @@
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
Requires: maven-shared-plugin-tools-api
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-help
Gets information about the working environment for the project.
@@ -808,12 +616,6 @@
Requires: plexus-utils >= 1.2
Requires: jmock >= 1.0.1
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-idea
Creates/updates an IDEA workspace for the current project
(individual modules are created as IDEA modules).
@@ -826,12 +628,6 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-install
Installs the built artifact into the local repository.
@@ -848,12 +644,6 @@
%endif
Requires: bsh
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-invoker
The Maven Invoker Plugin is used to run a set of Maven projects and makes
sure that each project execution is successful, and optionally verifies
@@ -868,12 +658,6 @@
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
Requires: plexus-utils >= 1.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-jar
Builds a JAR from the current project.
@@ -891,12 +675,6 @@
Requires: plexus-utils >= 1.2
Requires: maven-shared-reporting-impl
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-javadoc
Generates Javadoc for the project.
@@ -911,12 +689,6 @@
Requires: junit >= 3.8.2
Requires: maven-shared-model-converter
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-one
A plugin for interacting with legacy Maven 1.x repositories and builds.
@@ -933,12 +705,6 @@
Requires: plexus-utils >= 1.2
Requires: plexus-container-default
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-plugin
Creates a Maven plugin descriptor for any Mojo's found in the source tree,
to include in the JAR.
@@ -956,12 +722,6 @@
Requires: xom
Requires: maven-shared-reporting-impl
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-pmd
Generates a PMD report.
@@ -982,12 +742,6 @@
Requires: maven-doxia >= 1.0-0.a9
Requires: maven-doxia-sitetools >= 1.0
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-project-info-reports
Generates standard project reports.
@@ -997,12 +751,6 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-rar
Builds a RAR from the current project.
@@ -1023,12 +771,6 @@
Requires: plexus-resources
%endif
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-remote-resources
The Maven Remote Resources Plugin is used to retrieve JARs of resources
from remote repositories, processes those resources, and incorporate them
@@ -1042,12 +784,6 @@
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
Requires: plexus-archiver >= 1.0
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-repository
Plugin to help with repository-based tasks.
@@ -1059,12 +795,6 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-resources
Copies the resources to the output directory for including in the JAR.
@@ -1079,12 +809,6 @@
%endif
Requires: plexus-utils >= 1.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-site
Generates a site for the current project.
@@ -1098,12 +822,6 @@
Requires: plexus-container-default >= 1.0
Requires: junit >= 3.8.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-source
Builds a JAR of sources for use in IDEs and distribution to the repository.
@@ -1117,12 +835,6 @@
Requires: plexus-utils
Requires: junit >= 3.8.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-stage
Maven Stage Plugin copies artifacts from one repository to another.
@@ -1138,12 +850,6 @@
%endif
Requires: plexus-utils >= 1.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-verifier
Useful for integration tests - verifies the existence of certain conditions.
@@ -1155,12 +861,6 @@
Requires: plexus-utils >= 1.2
Requires: junit >= 3.8.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description plugin-war
Builds a WAR from the current project.
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/maven/maven.spec?r1=1.18.2.1&r2=1.18.2.2&f=u
More information about the pld-cvs-commit
mailing list