[javapackages] Bump version in documentation
by Michal Srb
commit f60ffe1efacdf631ae7bef72d8dd3c2c26c1d7a7
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jan 12 08:21:06 2015 +0100
Bump version in documentation
doc/index.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/doc/index.txt b/doc/index.txt
index 28e8184..f8f3c4c 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -1,7 +1,7 @@
Java Packaging HOWTO
====================
-v4.3.1, 2014-12-23
+v4.3.2, 2014-01-12
include::preamble.txt[]
9 years, 5 months
[javapackages-tools/jenkins] Mock config tweaks
by Michal Srb
commit 99625ae56384cc1f4afb5c38b055242344a2e733
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jan 12 07:57:31 2015 +0100
Mock config tweaks
fedora-rawhide-x86_64.cfg | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-rawhide-x86_64.cfg b/fedora-rawhide-x86_64.cfg
index 54bb30b..075af92 100644
--- a/fedora-rawhide-x86_64.cfg
+++ b/fedora-rawhide-x86_64.cfg
@@ -1,7 +1,7 @@
config_opts['root'] = 'javapackages-rawhide'
config_opts['target_arch'] = 'x86_64'
config_opts['legal_host_arches'] = ('x86_64',)
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build PyXB asciidoc dia python-formencode python-lxml python-nose python-setuptools python2-devel scl-utils-build xmlto'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build python3-PyXB asciidoc dia python3-lxml python3-nose python3-setuptools python3-devel scl-utils-build xmlto'
config_opts['dist'] = 'rawhide' # only useful for --resultdir variable subst
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
config_opts['releasever'] = '21'
9 years, 5 months
[javapackages-tools/jenkins] Re-add mock config
by Michal Srb
commit 96e648ca357b8fe6478f8c6206f4c68fb934d9e0
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jan 12 07:53:06 2015 +0100
Re-add mock config
fedora-rawhide-x86_64.cfg | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/fedora-rawhide-x86_64.cfg b/fedora-rawhide-x86_64.cfg
new file mode 100644
index 0000000..54bb30b
--- /dev/null
+++ b/fedora-rawhide-x86_64.cfg
@@ -0,0 +1,37 @@
+config_opts['root'] = 'javapackages-rawhide'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build PyXB asciidoc dia python-formencode python-lxml python-nose python-setuptools python2-devel scl-utils-build xmlto'
+config_opts['dist'] = 'rawhide' # only useful for --resultdir variable subst
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['releasever'] = '21'
+
+config_opts['yum.conf'] = """
+[main]
+logfile=/var/log/yum.log
+retries=20
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+metadata_expire=1
+mirrorlist_expire=1
+debuglevel=2
+
+[mock-rawhide]
+name=mock-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64
+failovermethod=priority
+cost=1000
+
+[mock-koji]
+name=mock-koji
+baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/
+cost=2000
+
+[mock-override]
+name=mock-override
+baseurl=http://people.redhat.com/~mizdebsk/jenkins-extra-repo/
+gpgcheck=0
+cost=500
+"""
9 years, 5 months
[javapackages-tools/jenkins: 32/32] Merge branch 'master' into jenkins
by Michal Srb
commit 7c41e351e9698dc76e42650d23f6a22347b3a99b
Merge: c361747 d2960d4
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Jan 8 08:35:10 2015 +0100
Merge branch 'master' into jenkins
Conflicts:
build.bash
javapackages-tools.spec
.gitignore | 6 +
0001-Add-support-for-installing-hpi.patch | 85 ---------------
...rs-Switch-to-require-java-headless-instea.patch | 26 -----
...st-Fix-testsuite-for-java-headless-change.patch | 34 ------
fedora-rawhide-x86_64.cfg | 37 -------
javapackages-tools.spec | 109 ++++++++++++++++----
sources | 2 +-
7 files changed, 97 insertions(+), 202 deletions(-)
---
diff --cc javapackages-tools.spec
index 86376a7,52ec970..c39583e
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@@ -6,8 -6,8 +6,8 @@@
%endif
Name: javapackages-tools
- Version: 4.2.0
- Release: 2%{?dist}
-Version: 4.3.2
++Version: 4.4.0
+ Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
@@@ -161,24 -160,13 +160,20 @@@ This package provides non-essential mac
%prep
%setup -q -n javapackages-%{version}
+%if 0%{?with_python3}
+find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
+find ./depgenerators -name '*.req' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
+find ./depgenerators -name '*.prov' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
+%endif # with_python3
+
+
%build
- %configure
- ./build
-
- pushd python
%if 0%{?with_python3}
- %{__python3} setup.py build
+ %configure --pyinterpreter=%{__python3}
%else
- %{__python2} setup.py build
+ %configure --pyinterpreter=%{__python2}
%endif
- popd
+ ./build
%install
./install
9 years, 5 months
[javapackages-tools/jenkins] (32 commits) ...Merge branch 'master' into jenkins
by Michal Srb
Summary of changes:
d27d04c... Improve support for SCLs (*)
5449a7d... Generate requires on POM artifacts with "pom" extension (*)
de1e9d7... Apply the patch from my previous commit (*)
c30570b... Merge branch 'jenkins' (*)
d75a3d6... Add new sources for 4.0.0 and remove old patches (*)
e2f0c5d... Backport patches for maven.req (*)
adfc4ad... Add BR: javapackages-tools (*)
ca53168... Backport patch which adds support for "disableEffectivePom" (*)
cf612e3... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
e8641a5... Update docs (*)
f94bdba... Backport fix for maven.prov (*)
eaf8416... Install man page for pom_change_dep (*)
67dd7fb... Bump version to 4.1.0 (*)
aff8679... Merge branch 'jenkins' (*)
7bb246b... Update to upstream version 4.1.0 (*)
3fac015... Backport upstream patch for maven.req (*)
ee8847f... Update to upstream version 4.2.0 (*)
9860c4d... Fix mvn_artifact: generate R, if it's not explicitly disabl (*)
9eca914... Do not generate OSGi R on eclipse-platform (*)
2ae8a12... Fix pom_editor missing space between xmlns declarations (*)
827c3bd... Use wrapper script to inject ABRT agent JVM argument (*)
532a3d6... Fix path to ABRT agent DSO (*)
8b75963... Fix cache problem (Resolves: rhbz#1155185) (*)
0aabe81... Fix OSGi provides/requires generation in Java libdir (*)
8260ebc... Add namespace support in %mvn_artifact (*)
297b18e... Revert "Add namespace support in %mvn_artifact" (*)
22c439b... Scan lib64/ in OSGi dep generators (*)
aec2dc4... Remove dependency on libxslt (*)
32eaff6... Update to upstream version 4.3.0 (*)
4104d7f... Update to upstream version 4.3.1 (*)
d2960d4... Update to upstream version 4.3.2 (*)
7c41e35... Merge branch 'master' into jenkins
(*) This commit already existed in another branch; no separate mail sent
9 years, 5 months
[javapackages-tools] Fix TypeError in mvn_artifact
by Michal Srb
commit 6f229910fd85a9c9c2ac1cc8f527207576f0a9e8
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jan 12 07:25:45 2015 +0100
Fix TypeError in mvn_artifact
...t-Fix-TypeError-process_raw_request-got-a.patch | 85 ++++++++++++++++++++
javapackages-tools.spec | 4 +
2 files changed, 89 insertions(+), 0 deletions(-)
---
diff --git a/0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch b/0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch
new file mode 100644
index 0000000..4b2148f
--- /dev/null
+++ b/0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch
@@ -0,0 +1,85 @@
+From 20e013184330fa3b02340266dbe46d2660298978 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb(a)redhat.com>
+Date: Wed, 7 Jan 2015 00:47:08 +0100
+Subject: [PATCH] [mvn_artifact] Fix "TypeError: process_raw_request() got an
+ unexpected keyword argument 'scl'"
+
+---
+ java-utils/mvn_artifact.py | 12 +++++-------
+ macros.d/macros.xmvn | 2 +-
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
+index 0bd97e0..52d6dac 100644
+--- a/java-utils/mvn_artifact.py
++++ b/java-utils/mvn_artifact.py
+@@ -88,7 +88,7 @@ class UnknownVersion(Exception):
+ pass
+
+
+-def get_parent_pom(pom, scl=None):
++def get_parent_pom(pom):
+ try:
+ metadata = Metadata(config)
+ known_artifacts = metadata.get_provided_artifacts()
+@@ -103,7 +103,7 @@ def get_parent_pom(pom, scl=None):
+
+ req = ResolutionRequest(pom.groupId, pom.artifactId,
+ extension="pom", version=pom.version)
+- result = XMvnResolve.process_raw_request([req], scl=scl)[0]
++ result = XMvnResolve.process_raw_request([req])[0]
+ if not result:
+ raise Exception("Unable to resolve parent POM")
+
+@@ -169,7 +169,7 @@ def expand_props(deps, props):
+ d.interpolate(props)
+
+
+-def gather_dependencies(pom_path, scl=None):
++def gather_dependencies(pom_path):
+ if not pom_path:
+ return []
+ pom = POM(pom_path)
+@@ -189,7 +189,7 @@ def gather_dependencies(pom_path, scl=None):
+ except PomLoadingException:
+ pass
+ if not ppom:
+- ppom = get_parent_pom(parent, scl=scl)
++ ppom = get_parent_pom(parent)
+
+ parent = ppom.parent
+ pom_props = get_model_variables(ppom)
+@@ -246,8 +246,6 @@ if __name__ == "__main__":
+ help="skip dependencies section in resulting metadata")
+ parser.add_option("-D", action="append", type="str",
+ help="add artifact property", metavar="property=value")
+- parser.add_option("-n", "--namespace", type="str",
+- help=SUPPRESS_HELP, default=None)
+
+ sys.argv = args_to_unicode(sys.argv)
+
+@@ -300,7 +298,7 @@ if __name__ == "__main__":
+ if (not options.skip_dependencies and pom_path
+ and not is_it_ivy_file(pom_path)):
+ deps = []
+- mvn_deps = gather_dependencies(pom_path, scl=options.namespace)
++ mvn_deps = gather_dependencies(pom_path)
+ for d in mvn_deps:
+ deps.append(MetadataDependency.from_mvn_dependency(d))
+ if deps:
+diff --git a/macros.d/macros.xmvn b/macros.d/macros.xmvn
+index 1a587fb..e7a6dda 100644
+--- a/macros.d/macros.xmvn
++++ b/macros.d/macros.xmvn
+@@ -118,7 +118,7 @@
+ #
+ # Usage: %mvn_artifact <pom> [<artifact-file>]
+ #
+-%mvn_artifact %{pyinterpreter} %{javadir}-utils/mvn_artifact.py %{?scl:-n %{?scl}}
++%mvn_artifact %{pyinterpreter} %{javadir}-utils/mvn_artifact.py
+
+
+ # %mvn_build - build Maven project
+--
+2.1.0
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 52ec970..fd8cb16 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -14,6 +14,7 @@ Summary: Macros and scripts for Java packaging support
License: BSD
URL: https://git.fedorahosted.org/git/javapackages.git
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.ta...
+Patch0: 0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch
BuildArch: noarch
@@ -160,6 +161,8 @@ This package provides non-essential macros and scripts to support Java packaging
%prep
%setup -q -n javapackages-%{version}
+%patch0 -p1
+
%build
%if 0%{?with_python3}
%configure --pyinterpreter=%{__python3}
@@ -211,6 +214,7 @@ popd
%changelog
* Mon Jan 05 2015 Michal Srb <msrb(a)redhat.com> - 4.3.2-1
- Update to upstream version 4.3.2
+- Fix TypeError in mvn_artifact
* Tue Dec 23 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.3.1-1
- Update to upstream version 4.3.1
9 years, 5 months
[javapackages-tools] Update to upstream version 4.3.2
by Michal Srb
commit d2960d49fa0da72d71531cfd16ee0a89d88778d5
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jan 5 17:58:01 2015 +0100
Update to upstream version 4.3.2
.gitignore | 1 +
javapackages-tools.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6fc18a6..16cb761 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@
/javapackages-4.2.0.tar.xz
/javapackages-4.3.0.tar.xz
/javapackages-4.3.1.tar.xz
+/javapackages-4.3.2.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 90f8951..52ec970 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -6,7 +6,7 @@
%endif
Name: javapackages-tools
-Version: 4.3.1
+Version: 4.3.2
Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -209,6 +209,9 @@ popd
%doc LICENSE
%changelog
+* Mon Jan 05 2015 Michal Srb <msrb(a)redhat.com> - 4.3.2-1
+- Update to upstream version 4.3.2
+
* Tue Dec 23 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.3.1-1
- Update to upstream version 4.3.1
diff --git a/sources b/sources
index f75dbf6..e22be2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76aa1bc751e4667f3de6067d1df9c3e3 javapackages-4.3.1.tar.xz
+7d1ef162f04e546a0c58d745f2896d3c javapackages-4.3.2.tar.xz
9 years, 5 months
[Bug 804968] New: Put /etc/ant.d on the LOCALCLASSPATH
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: Put /etc/ant.d on the LOCALCLASSPATH
https://bugzilla.redhat.com/show_bug.cgi?id=804968
Summary: Put /etc/ant.d on the LOCALCLASSPATH
Product: Fedora
Version: 17
Platform: All
OS/Version: All
Status: NEW
Severity: unspecified
Priority: unspecified
Component: ant
AssignedTo: jcapik(a)redhat.com
ReportedBy: cdewolf(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, mmatejov(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com
Classification: Fedora
Story Points: ---
Type: ---
Regression: ---
Mount Type: ---
Documentation: ---
Description of problem:
To allow usage of antlib.xml scripts installed by other rpms /etc/ant.d must be
on the LOCALCLASSPATH for ant to find these scripts.
Version-Release number of selected component (if applicable):
ant-1.8.3-1.fc17.noarch
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
9 years, 5 months
[Bug 915191] Display env. is not set
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=915191
--- Comment #11 from Fedora End Of Life <endoflife(a)fedoraproject.org> ---
This message is a notice that Fedora 19 is now at end of life. Fedora
has stopped maintaining and issuing updates for Fedora 19. It is
Fedora's policy to close all bug reports from releases that are no
longer maintained. Approximately 4 (four) weeks from now this bug will
be closed as EOL if it remains open with a Fedora 'version' of '19'.
Package Maintainer: If you wish for this bug to remain open because you
plan to fix it in a currently maintained version, simply change the 'version'
to a later Fedora version.
Thank you for reporting this issue and we are sorry that we were not
able to fix it before Fedora 19 is end of life. If you would still like
to see this bug fixed and are able to reproduce it against a later version
of Fedora, you are encouraged change the 'version' to a later Fedora
version prior this bug is closed as described in the policy above.
Although we aim to fix as many bugs as possible during every release's
lifetime, sometimes those efforts are overtaken by events. Often a
more recent Fedora release includes newer upstream software that fixes
bugs or makes them obsolete.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=i5mFLujPjH&a=cc_unsubscribe
9 years, 5 months
[guacamole-client] Remove unused patch
by Simone Caronni
commit 8a0436ffae91aba26366e8f7c47a83fb5c9c49c5
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Fri Jan 9 11:01:49 2015 +0100
Remove unused patch
guacamole-client-ext.patch | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
9 years, 5 months