[javapackages] Hardcode %_datadir where necessary
by Mikolaj Izdebski
commit 273cf6e6a9cdb837aa57542011bafc2bf14c8490
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Oct 31 13:04:45 2012 +0100
Hardcode %_datadir where necessary
macros.fjava | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 022950d..b2a1a8c 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -71,7 +71,7 @@ for _dir in %{_jnidir} %{_javajnidir} %{_javadir}; do \
_jpath="%{buildroot}/$_dir/$_jarpart" \
fi \
done \
-python -m %{_datadir}/java-utils/maven_depmap %{-a} %{-v*:-r %{-v*}} \\\
+python -m /usr/share/java-utils/maven_depmap %{-a} %{-v*:-r %{-v*}} \\\
%{-m:-m %{buildroot}%{_maven_repository}} \\\
%{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
%{buildroot}%{_mavenpomdir}/$_pompart \\\
@@ -181,7 +181,7 @@ fi \
#
# Private macro, shouldn't be used directly
-%__pom_call . %{_datadir}/java-utils/pom_editor.sh; pom_
+%__pom_call . /usr/share/java-utils/pom_editor.sh; pom_
# %pom_remove_dep - remove dependency on Maven artifact from POM file
11 years, 5 months
[javapackages] Improve add_maven_depmap
by Mikolaj Izdebski
commit be33931ae4df9a9332af5c9074526bf4ef0915dc
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Oct 31 12:50:21 2012 +0100
Improve add_maven_depmap
- use -e to abort the whole scriplet if any command in the macro fails
- avoid creating temporary files
- add symlinks created with -v to maven-files
macros.fjava | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index ee368ec..022950d 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -55,23 +55,22 @@
# -%{version} variant and can create additional versioned symlinks
%add_maven_depmap(f:a:v:m) \
+set -e \
# default values \
%if %# == 0 \
- _pompart="JPP-%{name}.pom" \
+ _pompart="JPP-%{name}.pom" \
_jarpart="%{name}.jar" \
%else \
_pompart="%1" \
_jarpart="%2" \
%endif \
+_filelist="maven-files-%{name}%{-f*:-%{-f*}}" \
install -dm 755 $RPM_BUILD_ROOT/%{_mavendepmapfragdir}\
-_jpath="$_jarpart" \
-if [ -f %{buildroot}/%{_javadir}/$_jarpart ]; then \
- _jpath="%{buildroot}/%{_javadir}/$_jarpart" \
-elif [ -f %{buildroot}/%{_javajnidir}/$_jarpart ]; then \
- _jpath="%{buildroot}/%{_javajnidir}/$_jarpart" \
-elif [ -f %{buildroot}/%{_jnidir}/$_jarpart ]; then \
- _jpath="%{buildroot}/%{_jnidir}/$_jarpart" \
-fi \
+for _dir in %{_jnidir} %{_javajnidir} %{_javadir}; do \
+ if [ -f %{buildroot}/$_dir/$_jarpart ]; then \
+ _jpath="%{buildroot}/$_dir/$_jarpart" \
+ fi \
+done \
python -m %{_datadir}/java-utils/maven_depmap %{-a} %{-v*:-r %{-v*}} \\\
%{-m:-m %{buildroot}%{_maven_repository}} \\\
%{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
@@ -82,10 +81,7 @@ python -m %{_datadir}/java-utils/maven_depmap %{-a} %{-v*:-r %{-v*}} \\\
%if %# == 0 \
"${_jpath}" \\\
%endif \
- > maven-files.tmp \
-sed 's:%{buildroot}::' maven-files.tmp | cat - maven-files-%{name}%{-f*:-%{-f*}} \\\
- | sort | uniq > maven-files-%{name}%{-f*:-%{-f*}}.new \
-mv maven-files-%{name}%{-f*:-%{-f*}}.new maven-files-%{name}%{-f*:-%{-f*}} \
+ >> ${_filelist} \
# this part only works for jars for now (now war/other compat support) \
if [[ "%{-v}" != "" ]];then \
mv %{buildroot}%{_mavenpomdir}/$_pompart \\\
@@ -96,13 +92,17 @@ fi \
for ver in $(echo %{-v*} | tr ',' '\\n');do \
ln -s ${_pompart/.pom/-%{version}.pom} \\\
%{buildroot}/%{_mavenpomdir}/${_pompart/.pom/-$ver.pom} \
+ echo %{_mavenpomdir}/${_pompart/.pom/-$ver.pom} >>${_filelist} \
# we can have pom-only artifacts \
if [ -f ${_jpath/.jar/-%{version}.jar} ];then \
ln -s `basename ${_jpath/.jar/-%{version}.jar}` \\\
${_jpath/.jar/-$ver.jar} \
+ echo ${_jpath/.jar/-$ver.jar} >>${_filelist} \
fi \
done \
fi \
+sed -i 's:%{buildroot}::' ${_filelist} \
+sort -u -o ${_filelist} ${_filelist} \
\
%{nil}
11 years, 5 months
[javapackages-tools] Make sure add_maven_depmap fails when python tracebacks
by Stanislav Ochotnicky
commit 35910050404c72e691645b5f05e505929ac48df1
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Oct 31 11:52:27 2012 +0100
Make sure add_maven_depmap fails when python tracebacks
.gitignore | 1 +
javapackages-tools.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 397a290..1a42427 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/javapackages-0.5.0.tar.xz
/javapackages-0.6.0.tar.xz
/javapackages-0.7.0.tar.xz
+/javapackages-0.7.2.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 77ef8c7..ebea1da 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,5 +1,5 @@
Name: javapackages-tools
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
Summary: Fedora macros and scripts for Java packaging support
@@ -51,6 +51,9 @@ install -pm 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils/
%changelog
+* Wed Oct 31 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.7.2-1
+- Make sure add_maven_depmap fails when python tracebacks
+
* Wed Oct 31 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.7.1-1
- Fix problem with exception in default add_maven_depmap invocation
diff --git a/sources b/sources
index 8fc346d..47a427e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0fe200418355d632364de1e4eb0e167b javapackages-0.7.0.tar.xz
+32e642494a04ac24c350a90e87c90e1a javapackages-0.7.2.tar.xz
11 years, 5 months
[javapackages] Created tag 0.7.2
by Stanislav Ochotnicky
The lightweight tag '0.7.2' was created pointing to:
2f471c8... Make sure python failure will propragate to rpmbuild
11 years, 5 months
[javapackages] Make sure python failure will propragate to rpmbuild
by Stanislav Ochotnicky
commit 2f471c8a3ab6fc078bf5583754a55601c3ec9fd5
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Oct 31 11:47:48 2012 +0100
Make sure python failure will propragate to rpmbuild
Before this fix the error return code got hidden by the pipeline
macros.fjava | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index c645f83..ee368ec 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -82,7 +82,8 @@ python -m %{_datadir}/java-utils/maven_depmap %{-a} %{-v*:-r %{-v*}} \\\
%if %# == 0 \
"${_jpath}" \\\
%endif \
- | sed 's:%{buildroot}::' | cat - maven-files-%{name}%{-f*:-%{-f*}} \\\
+ > maven-files.tmp \
+sed 's:%{buildroot}::' maven-files.tmp | cat - maven-files-%{name}%{-f*:-%{-f*}} \\\
| sort | uniq > maven-files-%{name}%{-f*:-%{-f*}}.new \
mv maven-files-%{name}%{-f*:-%{-f*}}.new maven-files-%{name}%{-f*:-%{-f*}} \
# this part only works for jars for now (now war/other compat support) \
11 years, 5 months
[javapackages-tools] Fix problem with exception in default add_maven_depmap invocation
by Stanislav Ochotnicky
commit c6a85d1cdc58d7c044dd048c7e5f4b31b0102689
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Oct 31 11:29:57 2012 +0100
Fix problem with exception in default add_maven_depmap invocation
javapackages-tools.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index bd5a367..77ef8c7 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,5 +1,5 @@
Name: javapackages-tools
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
Summary: Fedora macros and scripts for Java packaging support
@@ -51,6 +51,9 @@ install -pm 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils/
%changelog
+* Wed Oct 31 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.7.1-1
+- Fix problem with exception in default add_maven_depmap invocation
+
* Tue Oct 30 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.7.0-1
- Update to latest upstream
- Full support for compat depmap generation
11 years, 5 months
[javapackages] Created tag 0.7.1
by Stanislav Ochotnicky
The lightweight tag '0.7.1' was created pointing to:
2bc3fe9... Fix for splitting non-string in default add_maven_depmap
11 years, 5 months
[javapackages] Fix for splitting non-string in default add_maven_depmap
by Stanislav Ochotnicky
commit 2bc3fe9dde844620ddb15c957100604f048d62ab
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Oct 31 11:26:49 2012 +0100
Fix for splitting non-string in default add_maven_depmap
scripts/maven_depmap.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/scripts/maven_depmap.py b/scripts/maven_depmap.py
index 9365f33..4129925 100644
--- a/scripts/maven_depmap.py
+++ b/scripts/maven_depmap.py
@@ -197,7 +197,10 @@ def output_fragment(fragment_path, fragment, mappings, versions):
"""Writes fragment into fragment_path in specialised format
compatible with jpp"""
with open(fragment_path, "aw") as ffile:
- versions = versions.split(',')
+ if not versions:
+ versions = []
+ else:
+ versions = versions.split(',')
versions.insert(0, fragment.version)
for ver in versions:
for m in mappings:
11 years, 5 months