mizdebsk pushed to plexus-cli (master). "Update to upstream version 1.6"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 1 16:03:02 UTC 2015
>From 4adc8dfea1cfc410500284192466a8d2f256555b Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed, 1 Apr 2015 17:56:46 +0200
Subject: Update to upstream version 1.6
diff --git a/plexus-cli-licenseheaders.patch b/plexus-cli-licenseheaders.patch
deleted file mode 100644
index f507d47..0000000
--- a/plexus-cli-licenseheaders.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Index: plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java
-===================================================================
-diff -u -N -r7725 -r8335
---- plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java (.../AbstractCli.java) (revision 7725)
-+++ plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/AbstractCli.java (.../AbstractCli.java) (revision 8335)
-@@ -1,5 +1,21 @@
- package org.codehaus.plexus.tools.cli;
-
-+/*
-+ * Copyright 2006 The Codehaus Foundation.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
- import org.apache.commons.cli.CommandLine;
- import org.apache.commons.cli.CommandLineParser;
- import org.apache.commons.cli.GnuParser;
-@@ -23,7 +39,7 @@
-
- /**
- * @author jason van zyl
-- * @version $Id: AbstractCli.java 7025 2007-10-27 00:36:10Z jvanzyl $
-+ * @version $Id: AbstractCli.java 8335 2009-08-12 13:55:32Z bentmann $
- * @noinspection UseOfSystemOutOrSystemErr,ACCESS_STATIC_VIA_INSTANCE
- */
- public abstract class AbstractCli
-Index: plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/Cli.java
-===================================================================
-diff -u -N -r7725 -r8335
---- plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/Cli.java (.../Cli.java) (revision 7725)
-+++ plexus-components/trunk/plexus-cli/src/main/java/org/codehaus/plexus/tools/cli/Cli.java (.../Cli.java) (revision 8335)
-@@ -1,5 +1,21 @@
- package org.codehaus.plexus.tools.cli;
-
-+/*
-+ * Copyright 2006 The Codehaus Foundation.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
- import org.codehaus.plexus.PlexusContainer;
- import org.apache.commons.cli.Options;
- import org.apache.commons.cli.CommandLine;
-Index: plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/CliTest.java
-===================================================================
-diff -u -N -r7725 -r8335
---- plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/CliTest.java (.../CliTest.java) (revision 7725)
-+++ plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/CliTest.java (.../CliTest.java) (revision 8335)
-@@ -1,5 +1,21 @@
- package org.codehaus.plexus.tools.cli;
-
-+/*
-+ * Copyright 2006 The Codehaus Foundation.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
- import org.codehaus.plexus.PlexusTestCase;
- import org.codehaus.plexus.util.FileUtils;
-
-Index: plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java
-===================================================================
-diff -u -N -r7725 -r8335
---- plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java (.../TestCli.java) (revision 7725)
-+++ plexus-components/trunk/plexus-cli/src/test/java/org/codehaus/plexus/tools/cli/TestCli.java (.../TestCli.java) (revision 8335)
-@@ -1,5 +1,21 @@
- package org.codehaus.plexus.tools.cli;
-
-+/*
-+ * Copyright 2006 The Codehaus Foundation.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
- import org.codehaus.plexus.PlexusContainer;
- import org.codehaus.plexus.util.FileUtils;
- import org.apache.commons.cli.Options;
diff --git a/plexus-cli.spec b/plexus-cli.spec
index 1e72180..a12225e 100644
--- a/plexus-cli.spec
+++ b/plexus-cli.spec
@@ -1,73 +1,22 @@
-# Copyright (c) 2000-2007, 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.
-#
-
-%global parent plexus
-%global subname cli
-
-Name: %{parent}-%{subname}
-Version: 1.2
-Release: 20%{?dist}
+Name: plexus-cli
+Version: 1.6
+Release: 1%{?dist}
Epoch: 0
Summary: Command Line Interface facilitator for Plexus
License: ASL 2.0
-Group: Development/Libraries
URL: https://github.com/codehaus-plexus/plexus-cli
-# svn export http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-cli-1.2
-# tar czf plexus-cli-%{version}-src.tar.gz plexus-cli-%{version}
-# Note: Exported revision 8188.
-Source0: %{name}-%{version}-src.tar.gz
-Source1: LICENSE-2.0.txt
-
-# License headers missing from some files
-# http://jira.codehaus.org/browse/PLX-418
-Patch0: plexus-cli-licenseheaders.patch
-
BuildArch: noarch
-BuildRequires: jpackage-utils >= 0:1.7.3
-BuildRequires: junit
+# git clone git://github.com/codehaus-plexus/plexus-cli.git
+# git --git-dir plexus-cli/.git archive --prefix plexus-cli-1.6/ 8927458e81 | xz >plexus-cli-1.6.tar.xz
+Source0: %{name}-%{version}.tar.xz
+Source1: LICENSE-2.0.txt
+
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-release
-BuildRequires: plexus-classworlds
-BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-utils
-BuildRequires: apache-commons-cli
-
-Requires: plexus-classworlds
-Requires: plexus-containers-container-default
-Requires: plexus-utils
+BuildRequires: mvn(commons-cli:commons-cli)
+BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:)
+BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
%description
The Plexus project seeks to create end-to-end developer tools for
@@ -79,47 +28,32 @@ is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
-Group: Documentation
-Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
%prep
%setup -q
-find . -name "*.jar" -exec rm -f {} \;
-
-%patch0 -p3
-
cp -p %{SOURCE1} .
+%mvn_file : plexus/cli
+
%build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_build
%install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 target/%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}.jar
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
-
-%add_maven_depmap JPP.%{parent}-%{subname}.pom plexus/%{subname}.jar
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install
%files -f .mfiles
-%doc LICENSE-2.0.txt
+%license LICENSE-2.0.txt
-%files javadoc
-%doc LICENSE-2.0.txt
-%{_javadocdir}/*
+%files javadoc -f .mfiles-javadoc
+%license LICENSE-2.0.txt
%changelog
+* Wed Apr 1 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.6-1
+- Update to upstream version 1.6
+
* Wed Apr 1 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.2-20
- Update upstream URL
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/plexus-cli.git/commit/?h=master&id=4adc8dfea1cfc410500284192466a8d2f256555b
More information about the scm-commits
mailing list