Merge branch 'jenkins'

Conflicts:
	javapackages-tools.spec
This commit is contained in:
Michal Srb 2014-06-23 13:10:25 +02:00
commit aff86795a7
2 changed files with 5 additions and 4 deletions

View File

@ -14,8 +14,8 @@ gpgcheck=0
assumeyes=1
syslog_ident=mock
syslog_device=
metadata_expire=600
mirrorlist_expire=600
metadata_expire=1
mirrorlist_expire=1
debuglevel=2
[mock-rawhide]

View File

@ -1,6 +1,6 @@
Name: javapackages-tools
Version: 4.0.0
Release: 8%{?dist}
Version: 4.1.0
Release: 0%{?dist}
Summary: Macros and scripts for Java packaging support
@ -32,6 +32,7 @@ BuildRequires: python-nose
BuildRequires: dia
BuildRequires: PyXB >= 1.2.3
BuildRequires: javapackages-tools >= 4.0.0
BuildRequires: xmvn-resolve >= 2.0.0
Requires: coreutils
Requires: libxslt