[maven] Add OrderWithRequires: xmvn
by Mikolaj Izdebski
commit 5f933c9f1c73b539f69128995517feaa01df0e13
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Nov 5 17:10:31 2013 +0100
Add OrderWithRequires: xmvn
- Related: rhbz#1014355
maven.spec | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index a2c2b6a..533fa4f 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,6 +1,6 @@
Name: maven
Version: 3.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -22,6 +22,10 @@ Patch200: 0001-Update-Aether-to-0.9.0.M3.patch
BuildArch: noarch
+# If XMvn is part of the same RPM transaction then it should be
+# installed first to avoid triggering rhbz#1014355.
+OrderWithRequires: xmvn
+
BuildRequires: maven-local
BuildRequires: aether-api >= 1:0
@@ -260,6 +264,10 @@ ln -sf $(build-classpath plexus/classworlds) \
%changelog
+* Tue Nov 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-5
+- Add OrderWithRequires: xmvn
+- Related: rhbz#1014355
+
* Tue Oct 29 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-4
- Add explicit requires
10 years, 5 months
[javapackages] Post release version bump for 3.5.0-SNAPSHOT
by Stanislav Ochotnicky
commit 408473d0f7ed44df00f5779802ab3829a53b5585
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Nov 5 16:49:16 2013 +0100
Post release version bump for 3.5.0-SNAPSHOT
VERSION | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/VERSION b/VERSION
index 47b322c..18bb6ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.4.1
+3.5.0-SNAPSHOT
10 years, 5 months
[javapackages] Prep for 0.4.1 release
by Stanislav Ochotnicky
commit 215afd6b461e255e29ee42b43e0b9349533f37ef
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Nov 5 16:22:11 2013 +0100
Prep for 0.4.1 release
VERSION | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/VERSION b/VERSION
index 18bb6ae..47b322c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.0-SNAPSHOT
+3.4.1
10 years, 5 months
[javapackages] [todo] cleanup done things
by Stanislav Ochotnicky
commit c4dbb1a99024561ebf1131939127310f916b82d5
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Nov 5 16:21:52 2013 +0100
[todo] cleanup done things
TODO | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/TODO b/TODO
index d1d8ce2..5c1f83f 100644
--- a/TODO
+++ b/TODO
@@ -19,18 +19,6 @@
https://bugzilla.redhat.com/buglist.cgi?product=Fedora&component=javapack...
-** Expand test cases for require generator & multiple provided artifacts, each with
- different namespace (i.e. require jpackage-utils & nsX-runtime at the same
- time)
* FEATURES
-** SCL support
-
- %jpackage_script should check SCL, perhaps automatically activate SCL?
- Then you could just run /opt/rh/maven31/bin/mvn and Maven would be ran
- with maven31 SCL activated (just an idea, I'm not sure about that)
-
- generated quto-requires should include SCL-specific metapackage
- instead of jpackage-utils. The SCL package is assumed to own all
- the directories like /opt/rh/scl/usr/share/maven-fragments etc.
10 years, 5 months
[javapackages] Remove double slashes. Use consistent %{buildroot}
by Mikolaj Izdebski
commit a72382753604c1b67a3166426104f1f029a98cec
Author: Mattias Ellert <mattias.ellert(a)fysast.uu.se>
Date: Thu Sep 12 16:17:10 2013 +0200
Remove double slashes. Use consistent %{buildroot}
Signed-off-by: Mikolaj Izdebski <mizdebsk(a)redhat.com>
etc/macros.fjava | 2 +-
etc/macros.jpackage | 8 ++++----
etc/macros.xmvn | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/etc/macros.fjava b/etc/macros.fjava
index c0862af..bdfd624 100644
--- a/etc/macros.fjava
+++ b/etc/macros.fjava
@@ -59,7 +59,7 @@ set -e \
_jarpart="%2" \
%endif \
_filelist=".mfiles%{-f*:-%{-f*}}" \
-install -dm 755 %{buildroot}%{_mavendepmapfragdir}\
+install -dm 755 %{buildroot}%{_mavendepmapfragdir} \
for _dir in %{_jnidir} %{_javajnidir} %{_javadir}; do \
if [ -f %{buildroot}$_dir/$_jarpart ]; then \
_jpath="%{buildroot}$_dir/$_jarpart" \
diff --git a/etc/macros.jpackage b/etc/macros.jpackage
index 6d830c4..c3a1d8f 100644
--- a/etc/macros.jpackage
+++ b/etc/macros.jpackage
@@ -136,7 +136,7 @@
# %{javadir}-ext/foo.jar
# %{javadir}-*/bar.jar
#
-%add_jvm_extension JAVA_LIBDIR=%{buildroot}/%{_javadir} %{_bindir}/jvmjar -l
+%add_jvm_extension JAVA_LIBDIR=%{buildroot}%{_javadir} %{_bindir}/jvmjar -l
#
@@ -152,8 +152,8 @@
# %6 whether to prefer a jre over a sdk when finding a jvm
#
%jpackage_script() \
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}\
-cat > $RPM_BUILD_ROOT%{_bindir}/%5 << EOF \
+install -d -m 755 %{buildroot}%{_bindir} \
+cat > %{buildroot}%{_bindir}/%5 << EOF \
#!/bin/sh\
#\
# %{name} script\
@@ -188,5 +188,5 @@ set_options \\$BASE_OPTIONS\
# Let's start\
run "\\$@"\
EOF\
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/%5\
+chmod 755 %{buildroot}%{_bindir}/%5\
%{nil}
diff --git a/etc/macros.xmvn b/etc/macros.xmvn
index bba3db9..5ec8123 100644
--- a/etc/macros.xmvn
+++ b/etc/macros.xmvn
@@ -144,8 +144,8 @@
xmvn-install %{?-X} -R .xmvn-reactor -n "${RPM_PACKAGE_NAME}" -d "%{buildroot}" \
jdir="%{-J*:%{-J*}}%{!-J*:target/site/apidocs}" \
if [ -d "${jdir}" ]; then \
- install -dm755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name} \
- cp -pr "${jdir}"/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} \
- echo '/%{_javadocdir}/%{name}' >>.mfiles-javadoc \
+ install -dm755 %{buildroot}%{_javadocdir}/%{name} \
+ cp -pr "${jdir}"/* %{buildroot}%{_javadocdir}/%{name} \
+ echo '%{_javadocdir}/%{name}' >>.mfiles-javadoc \
fi \
%{nil}
10 years, 5 months
[plexus-mail-sender] Fix release tag
by Mikolaj Izdebski
commit d4694014087344be94dfc7b38618e647427824b8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Nov 4 10:22:55 2013 +0100
Fix release tag
plexus-mail-sender.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index 7d2c4ab..e673757 100644
--- a/plexus-mail-sender.spec
+++ b/plexus-mail-sender.spec
@@ -32,7 +32,7 @@
Name: plexus-mail-sender
Version: 1.0
-Release: 0.a2.24%{?dist}
+Release: 0.25.a2%{?dist}
Epoch: 0
Summary: Plexus Mail Sender
License: MIT and ASL 1.1
@@ -117,6 +117,9 @@ find . -iname 'pom.xml' -exec sed -i \
%changelog
+* Mon Nov 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.0-0.25.a2
+- Fix release tag
+
* Thu Feb 7 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.0-0.a2.24
- Fix release tag
10 years, 5 months