[plexus-io] Update to upstream 2.0.5 release.
by Alexander Kurtakov
commit 404c152cb1369d063ea290322aa0acac8d798444
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Oct 10 09:45:23 2012 +0300
Update to upstream 2.0.5 release.
.gitignore | 1 +
plexus-io.spec | 13 ++++++++-----
sources | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d03796c..74239b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ plexus-io-1.0-alpha-5.tar.bz2
plexus-io-2.0.1.tar.xz
/plexus-io-2.0.2.tar.xz
sonatype-plexus-io-plexus-io-2.0.4-0-g2767dfe.tar.gz
+/sonatype-plexus-io-plexus-io-2.0.5-0-g4a31728.tar.gz
diff --git a/plexus-io.spec b/plexus-io.spec
index f9c1665..8b53106 100644
--- a/plexus-io.spec
+++ b/plexus-io.spec
@@ -1,13 +1,13 @@
Name: plexus-io
-Version: 2.0.4
-Release: 2%{?dist}
+Version: 2.0.5
+Release: 1%{?dist}
Summary: Plexus IO Components
Group: Development/Libraries
License: ASL 2.0
URL: http://plexus.codehaus.org/plexus-components/plexus-io
-# fetched from https://github.com/sonatype/plexus-io/tarball/plexus-io-2.0.4
-Source0: sonatype-plexus-io-plexus-io-2.0.4-0-g2767dfe.tar.gz
+# fetched from https://github.com/sonatype/plexus-io/tarball/plexus-io-2.0.5
+Source0: sonatype-plexus-io-plexus-io-2.0.5-0-g4a31728.tar.gz
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -42,7 +42,7 @@ API documentation for %{name}.
%prep
-%setup -q -n sonatype-plexus-io-fd7f1a8
+%setup -q -n sonatype-plexus-io-1a0010b
%build
mvn-rpmbuild install javadoc:aggregate
@@ -75,6 +75,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Wed Oct 10 2012 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.5-1
+- Update to upstream 2.0.5 release.
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 5e1a0b4..256efa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b3a2888c482c234547aa0866ccb72eb sonatype-plexus-io-plexus-io-2.0.4-0-g2767dfe.tar.gz
+f78ef5b6d2885c70d705c3e646f25056 sonatype-plexus-io-plexus-io-2.0.5-0-g4a31728.tar.gz
11 years, 6 months
[javapackages] Add optional argument for add_maven_depmap to create maven repo
by Stanislav Ochotnicky
commit cfe49dbb45eca11601a976ef68e2879a4ab3399f
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Oct 9 15:36:25 2012 +0200
Add optional argument for add_maven_depmap to create maven repo
This will create maven repository structure under %_maven_repository
which is /usr/share/maven-repository by default
macros.fjava | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 63177e6..c7301b4 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -54,7 +54,7 @@
# in the end add_maven_depmap optionally moves jar and pom file to
# -%{version} variant and can create additional versioned symlinks
-%add_maven_depmap(f:a:v:) \
+%add_maven_depmap(f:a:v:m) \
# default values \
%if %# == 0 \
_pompart="JPP-%{name}.pom" \
@@ -73,6 +73,7 @@ elif [ -f %{buildroot}/%{_jnidir}/$_jarpart ]; then \
_jpath="%{buildroot}/%{_jnidir}/$_jarpart" \
fi \
python -m %{_datadir}/java-utils/maven_depmap %{-a} \\\
+ %{-m:-m %{buildroot}%{_maven_repository}} \\\
%{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
%{buildroot}%{_mavenpomdir}/$_pompart \\\
%if %# == 2 \
11 years, 6 months
[javapackages] Add _maven_repository data definition and _maven_files macro
by Stanislav Ochotnicky
commit 66c0939339a895ca5940aa50724154813deff31f
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Oct 9 15:35:16 2012 +0200
Add _maven_repository data definition and _maven_files macro
_maven_files will eventually automatically include generated maven repository
files without need to manually specify them
macros.fjava | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 21337b2..63177e6 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -31,6 +31,12 @@
# Mikolaj Izdebski <mizdebsk(a)redhat.com>
+%_maven_repository %{_datadir}/maven-repository
+
+%_maven_files() %{expand:
+%{_mavendepmapfragdir}/%{!1:%{name}:%1}
+}
+
#==============================================================================
#
# add_maven_depmap is simplified version of jpackage-style add_to_maven_depmap
11 years, 6 months