[apache-commons-compress] Build with xmvn
by Mikolaj Izdebski
commit 6a6c14152e5e8ec298abad551fd6ba17a64a6c91
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 8 16:47:53 2013 +0100
Build with xmvn
apache-commons-compress.spec | 102 ++++++++++++++----------------------------
1 files changed, 34 insertions(+), 68 deletions(-)
---
diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec
index af01597..60432f4 100644
--- a/apache-commons-compress.spec
+++ b/apache-commons-compress.spec
@@ -1,96 +1,62 @@
%global base_name compress
%global short_name commons-%{base_name}
-Name: apache-%{short_name}
-Version: 1.4.1
-Release: 2%{?dist}
-Summary: Java API for working with tar, zip and bzip2 files
-Group: Development/Libraries
-License: ASL 2.0
-URL: http://commons.apache.org/%{base_name}/
-Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
-BuildArch: noarch
-
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: apache-commons-parent
-BuildRequires: junit4
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: xz-java
-Requires: java >= 1:1.6.0
-Requires: jpackage-utils
-Requires: xz-java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
-# Upstream name change
-Provides: jakarta-%{short_name} = %{version}-%{release}
-Obsoletes: jakarta-%{short_name} < 1.0-2
+Name: apache-%{short_name}
+Version: 1.4.1
+Release: 3%{?dist}
+Summary: Java API for working with compressed files and archivers
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://commons.apache.org/%{base_name}/
+Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
+BuildArch: noarch
+
+BuildRequires: xmvn >= 0.2.1
+BuildRequires: javapackages-tools >= 0.10.0
+BuildRequires: apache-commons-parent
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: xz-java
+
+Provides: jakarta-%{short_name} = %{version}-%{release}
+Obsoletes: jakarta-%{short_name} < 1.0-2
%description
-The code in this component came from Avalon's Excalibur, but originally
-from Ant, as far as life in Apache goes. The tar package is originally
-Tim Endres' public domain package. The bzip2 package is based on the
-work done by Keiron Liddle. It has migrated via:
-Ant -> Avalon-Excalibur -> Commons-IO -> Commons-Compress.
+The Apache Commons Compress library defines an API for working with
+ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200 and bzip2 files.
%package javadoc
-Summary: Javadocs for %{name}
+Summary: API documentation for %{name}
Group: Documentation
-Requires: jpackage-utils
-
-# Upstream name change
-Provides: jakarta-%{short_name}-javadoc = %{version}-%{release}
-Obsoletes: jakarta-%{short_name}-javadoc < 1.0-2
+Provides: jakarta-%{short_name}-javadoc = %{version}-%{release}
+Obsoletes: jakarta-%{short_name}-javadoc < 1.0-2
%description javadoc
-This package contains the API documentation for %{name}.
+This package provides %{summary}.
%prep
%setup -q -n %{short_name}-%{version}-src
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_file : %{short_name} %{name}
+%mvn_alias : commons:
+%mvn_build
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-
-# poms
-install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%post
-%update_maven_depmap
+%mvn_install
-
-%postun
-%update_maven_depmap
-
-
-%files
-%defattr(-,root,root,-)
+%files -f .mfiles
%doc LICENSE.txt NOTICE.txt
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/*
-%files javadoc
-%defattr(-,root,root,-)
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jan 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.4.1-3
+- Build with xmvn
+- Update to current packaging guidelines
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 3 months
[javapackages-tools] Upload sources for 0.10.0
by Mikolaj Izdebski
commit 5a40e81117f740ddebfc7a2ead451617ccfeb133
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 8 11:42:17 2013 +0100
Upload sources for 0.10.0
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5dbebd9..a0eac2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/javapackages-0.8.3.tar.xz
/javapackages-0.9.0.tar.xz
/javapackages-0.9.1.tar.xz
+/javapackages-0.10.0.tar.xz
diff --git a/sources b/sources
index 0608f24..ae9b1bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c0c94e01aa3b74118a2ea6650a90a2c javapackages-0.9.1.tar.xz
+6ef031dbea31f17751d538e2b91cef81 javapackages-0.10.0.tar.xz
11 years, 3 months
[javapackages-tools] Update to upstream version 0.10.0
by Mikolaj Izdebski
commit 93b23c225ef6ccd978da566d3d2a5c645b757cce
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jan 7 19:54:59 2013 +0100
Update to upstream version 0.10.0
- Implement %xmvn_alias, %xmvn_file and %xmvn_package macros
- Fix regex in osgi.attr
- Add support for pre- and post-goals in mvn-build script
javapackages-tools.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index f698fbc..710a969 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,5 +1,5 @@
Name: javapackages-tools
-Version: 0.9.1
+Version: 0.10.0
Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -65,7 +65,7 @@ install -p -m 644 macros.fjava $RPM_BUILD_ROOT%{_sysconfdir}/rpm
install -p -m 644 macros.xmvn $RPM_BUILD_ROOT%{_sysconfdir}/rpm
install -p -m 644 scripts/maven_depmap.py $RPM_BUILD_ROOT%{_javadir}-utils
install -p -m 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils
-install -p -m 755 scripts/mvn-build $RPM_BUILD_ROOT%{_bindir}
+install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
# Ugly as hell, but Eclipse relocated various artifacts under
@@ -100,10 +100,16 @@ install -p -m 755 scripts/mvn-build $RPM_BUILD_ROOT%{_bindir}
%files -n maven-local
%{_mavendepmapfragdir}/%{name}
%config(noreplace) %{_sysconfdir}/rpm/macros.xmvn
-%{_bindir}/mvn-build
+%{_bindir}/mvn-*
%changelog
+* Mon Jan 7 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.10.0-1
+- Update to upstream version 0.10.0
+- Implement %%xmvn_alias, %%xmvn_file and %%xmvn_package macros
+- Fix regex in osgi.attr
+- Add support for pre- and post-goals in mvn-build script
+
* Mon Dec 10 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.9.1-1
- Update to upstream version 0.9.1
- Resolves: rhbz#885636
11 years, 3 months
[javapackages] Sort git version tags in ascending order
by Mikolaj Izdebski
commit 518988b5bef752519e57546da07e3b47412b9a06
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jan 7 19:48:06 2013 +0100
Sort git version tags in ascending order
make_release | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/make_release b/make_release
index 2e48267..43cf3d3 100755
--- a/make_release
+++ b/make_release
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2011, Red Hat, Inc
+# Copyright (c) 2011, 2013 Red Hat, Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
# takes last tag and creates a release from it
-last_tag=`git tag | tail -n1`
+last_tag=`git tag | sort -V | tail -n1`
if [ -z $last_tag ];then
echo "Nothing to do, no tags exist"
11 years, 3 months
[javapackages] Created tag 0.10.0
by Mikolaj Izdebski
The lightweight tag '0.10.0' was created pointing to:
23de5e8... Implement %xmvn_alias, %xmvn_file and %xmvn_package macros
11 years, 3 months
[javapackages] Implement %xmvn_alias, %xmvn_file and %xmvn_package macros
by Mikolaj Izdebski
commit 23de5e80e072f1047ac073e8bdee592ee7c46a51
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jan 7 19:35:34 2013 +0100
Implement %xmvn_alias, %xmvn_file and %xmvn_package macros
LICENSE | 2 +-
macros.xmvn | 17 ++++++++++++++++-
scripts/mvn-alias | 47 +++++++++++++++++++++++++++++++++++++++++++++++
scripts/mvn-build | 6 ++++++
scripts/mvn-file | 47 +++++++++++++++++++++++++++++++++++++++++++++++
scripts/mvn-package | 42 ++++++++++++++++++++++++++++++++++++++++++
6 files changed, 159 insertions(+), 2 deletions(-)
---
diff --git a/LICENSE b/LICENSE
index 2b342b9..5954358 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011, 2012 Red Hat, Inc.
+Copyright (c) 2011-2013 Red Hat, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/macros.xmvn b/macros.xmvn
index bc80ab0..7b92a9e 100644
--- a/macros.xmvn
+++ b/macros.xmvn
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Red Hat, Inc.
+# Copyright (c) 2012-2013 Red Hat, Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,21 @@
# unless you are prepared to face consequences (FTBFS, API change etc.)
#
+# %mvn_package - TODO
+#
+%mvn_package mvn-package
+
+#
+# %mvn_alias - TODO
+#
+%mvn_alias mvn-alias
+
+#
+# %mvn_file - TODO
+#
+%mvn_file mvn-file
+
+#
# %mvn_build - build Maven project
#
%mvn_build mvn-build
diff --git a/scripts/mvn-alias b/scripts/mvn-alias
new file mode 100755
index 0000000..88d778c
--- /dev/null
+++ b/scripts/mvn-alias
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+# Copyright (c) 2013 Red Hat, Inc.
+# 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 Red Hat 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.
+#
+# Authors: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+
+if [ $# -lt 2 ]; then
+ echo "$0: At least 2 arguments are required." >&2
+ exit 1
+fi
+
+pattern="$1" shift
+
+while [ $# -gt 0 ]; do
+ echo "export XMVN_INSTALL_DEPMAPS=\"\$XMVN_INSTALL_DEPMAPS\"'$pattern
+$1
+'" >>.xmvnrc
+ shift
+done
+
+exit 0
diff --git a/scripts/mvn-build b/scripts/mvn-build
index d1be9d2..3951c23 100755
--- a/scripts/mvn-build
+++ b/scripts/mvn-build
@@ -87,6 +87,7 @@ base_goal=verify
skip_tests=
install_goal=org.fedoraproject.xmvn:xmvn-mojo:install
javadoc_goal=org.apache.maven.plugins:maven-javadoc-plugin:aggregate
+builddep_goal=org.fedoraproject.xmvn:xmvn-mojo:builddep
add_depmaps=
singleton=test
pre_goals=
@@ -169,6 +170,10 @@ if $singleton; then
export XMVN_INSTALL_LAYOUT="$XMVN_INSTALL_LAYOUT;^(.*)$=>@1"
fi
+if [ -f .xmvnrc ]; then
+ . ./.xmvnrc
+fi
+
xmvn \
--offline \
@@ -180,4 +185,5 @@ xmvn \
$base_goal \
$install_goal \
$javadoc_goal \
+ $builddep_goal \
$post_goals
diff --git a/scripts/mvn-file b/scripts/mvn-file
new file mode 100755
index 0000000..93cc8da
--- /dev/null
+++ b/scripts/mvn-file
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+# Copyright (c) 2013 Red Hat, Inc.
+# 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 Red Hat 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.
+#
+# Authors: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+
+if [ $# -lt 2 ]; then
+ echo "$0: At least 2 arguments are required." >&2
+ exit 1
+fi
+
+pattern="$1" shift
+
+while [ $# -gt 0 ]; do
+ echo "export XMVN_INSTALL_FILES=\"\$XMVN_INSTALL_FILES\"'$pattern
+$1
+'" >>.xmvnrc
+ shift
+done
+
+exit 0
diff --git a/scripts/mvn-package b/scripts/mvn-package
new file mode 100755
index 0000000..fa3dc6b
--- /dev/null
+++ b/scripts/mvn-package
@@ -0,0 +1,42 @@
+#!/bin/sh -e
+# Copyright (c) 2013 Red Hat, Inc.
+# 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 Red Hat 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.
+#
+# Authors: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+
+if [ $# -ne 2 ]; then
+ echo "$0: Exactly 2 arguments are required." >&2
+ exit 1
+fi
+
+echo "export XMVN_INSTALL_LAYOUT=\"\$XMVN_INSTALL_LAYOUT\"'$1
+$2
+'" >>.xmvnrc
+
+exit 0
11 years, 3 months
[maven-plugin-testing/f18] Updated to latest upstream version
by tradej@fedoraproject.org
commit e7a0bf9813e16f78b74e62b12caea0241b92ac38
Author: Tomas Radej <tradej(a)redhat.com>
Date: Mon Jan 7 15:31:34 2013 +0100
Updated to latest upstream version
- Cleanup - removed patches, old files etc.
- Added requires to subpackages
.gitignore | 1 +
maven-plugin-testing-depmap.xml | 27 -------------
...ugin-testing-harness-AbstractMojoTestCase.patch | 11 -----
maven-plugin-testing-harness-ArtifactStub.patch | 20 ---------
maven-plugin-testing-harness-SilentLog.patch | 13 ------
maven-plugin-testing-harness-pom.patch | 19 ---------
maven-plugin-testing-maven3-missing-methods.patch | 25 ------------
maven-plugin-testing.spec | 42 ++++++++++---------
sources | 2 +-
9 files changed, 24 insertions(+), 136 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 56ee4b0..5f68415 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-plugin-testing-1.2.tar.xz
/maven-plugin-testing-2.0-alpha-1.tar.xz
+/maven-plugin-testing-2.1-source-release.zip
diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec
index f599313..0c9662f 100644
--- a/maven-plugin-testing.spec
+++ b/maven-plugin-testing.spec
@@ -1,19 +1,15 @@
%global ver_suffix -alpha-1
Name: maven-plugin-testing
-Version: 2.0
-Release: 4.alpha1%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Summary: Maven Plugin Testing
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugin-testing/
-#svn export http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-te...
-#tar caf maven-plugin-testing-2.0-alpha-1.tar.xz maven-plugin-testing-2.0-alpha-1
-Source0: %{name}-%{version}%{ver_suffix}.tar.xz
-
-Patch0: %{name}-maven3-missing-methods.patch
+Source0: http://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{v...
BuildArch: noarch
@@ -54,6 +50,9 @@ API documentation for %{name}.
Summary: Maven Plugin Testing Mechanism
Group: Development/Libraries
Requires: maven-plugin-testing = %{version}-%{release}
+Requires: plexus-archiver
+Requires: plexus-utils
+BuildRequires: maven-surefire-provider-junit4
Obsoletes: maven-shared-plugin-testing-harness <= 0:1.2
Provides: maven-shared-plugin-testing-harness = 1:%{version}-%{release}
@@ -64,6 +63,8 @@ The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
Summary: Maven Plugin Testing Tools
Group: Development/Libraries
Requires: maven-plugin-testing = %{version}-%{release}
+Requires: maven-shared-invoker
+Requires: plexus-utils
Obsoletes: maven-shared-plugin-testing-tools <= 0:%{version}-%{release}
Provides: maven-shared-plugin-testing-tools = 1:%{version}-%{release}
@@ -74,6 +75,8 @@ A set of useful tools to help the Maven Plugin testing.
Summary: Maven Testing Tool
Group: Development/Libraries
Requires: maven-plugin-testing = %{version}-%{release}
+Requires: easymock3
+Requires: plexus-utils
Obsoletes: maven-shared-test-tools <= 0:%{version}-%{release}
Provides: maven-shared-test-tools = 1:%{version}-%{release}
@@ -81,22 +84,21 @@ Provides: maven-shared-test-tools = 1:%{version}-%{release}
Framework to test Maven Plugins with Easymock objects.
%prep
-%setup -q -n %{name}-%{version}%{ver_suffix}
-
-%patch0 -p1
+%setup -q
%build
-mvn-rpmbuild -Dmaven.test.failure.ignore=true install javadoc:aggregate
-#tests are skipped due to some test failures most probably caused by issues with our plexus container
+# Tests are skipped due to some test failures most probably caused by issues
+# with our plexus container
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.failure.ignore
%install
# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
-install -m 644 maven-plugin-testing-harness/target/%{name}-harness-%{version}%{ver_suffix}.jar \
+install -m 644 maven-plugin-testing-harness/target/%{name}-harness-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/%{name}-harness.jar
-install -m 644 maven-plugin-testing-tools/target/%{name}-tools-%{version}%{ver_suffix}.jar \
+install -m 644 maven-plugin-testing-tools/target/%{name}-tools-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/%{name}-tools.jar
-install -m 644 maven-test-tools/target/maven-test-tools-%{version}%{ver_suffix}.jar \
+install -m 644 maven-test-tools/target/maven-test-tools-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/maven-test-tools.jar
# poms
@@ -115,11 +117,6 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%add_maven_depmap -f tools -a "org.apache.maven.shared:%{name}-tools" JPP.%{name}-%{name}-tools.pom %{name}/%{name}-tools.jar
%add_maven_depmap -f maven-test-tools -a "org.apache.maven.shared:maven-test-tools" JPP.%{name}-maven-test-tools.pom %{name}/maven-test-tools.jar
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
%files
%{_mavenpomdir}/JPP.%{name}-%{name}.pom
%{_mavendepmapfragdir}/%{name}
@@ -143,6 +140,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_mavendepmapfragdir}/%{name}-maven-test-tools
%changelog
+* Mon Jan 07 2013 Tomas Radej <tradej(a)redhat.com> - 2.1-1
+- Updated to latest upstream version
+- Cleanup - removed patches, old files etc.
+- Added requires to subpackages
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-4.alpha1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index c0ab830..b1e9e22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b966b2d07d5727da8247f7ca4907dea maven-plugin-testing-2.0-alpha-1.tar.xz
+c3ec130f445df5e955d060b288f854a0 maven-plugin-testing-2.1-source-release.zip
11 years, 3 months
[maven-help-plugin/f18] (3 commits) ...Install license files
by Mikolaj Izdebski
Summary of changes:
d3c9f4a... Fix HelpMojo.java package declaration (*)
9cbbd3a... Add patch maven-plugin-tools-3 compatibility (*)
ea1a3f6... Install license files (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 3 months