rpm/javapackages-tools
SHA256
1
0
Fork 0
forked from pool/javapackages-tools
Code Pull Requests Activity

- Try to break buildcycle detected on Factory

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=26
This commit is contained in:
Tomáš Chvátal 2015-03-31 10:28:52 +00:00 committed by Git OBS Bridge
parent 60d6f8746f
commit 570c955934
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
javapackages-tools.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 31 10:28:12 UTC 2015 - tchvatal@suse.com
- Try to break buildcycle detected on Factory
-------------------------------------------------------------------
Wed Mar 18 10:44:29 UTC 2015 - tchvatal@suse.com

24
javapackages-tools.spec
View File

@ -30,7 +30,6 @@ Patch0: suse-use-libdir.patch
#PATCH-FIX-SUSE: We put macros to /etc/rpm directly so make it reflected by
# the install script
Patch1: suse-macros-install-location.patch
BuildRequires: ant
BuildRequires: asciidoc
BuildRequires: dia
BuildRequires: fdupes
@ -47,17 +46,16 @@ BuildRequires: xz
Requires: coreutils
Requires: lua
Requires: python
# Well even tho python is split it is required for most of the operations
Requires: python-javapackages = %{version}
# for the xb pom conversions
Requires: python-pyxb
Requires: python-six
# for xml.dom.minidom
Requires: python-xml
# Well even tho python is split it is required for most of the operations
Requires: python-javapackages = %{version}
Provides: jpackage-utils = %{version}-%{release}
Provides: jpackage-utils-java9
Provides: jpackage-utils = %{version}
Provides: jpackage-utils-java9 = %{version}
Obsoletes: jpackage-utils <= 1.7.5
#BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# for xsltproc
%if 0%{?suse_version} == 1110
@ -74,8 +72,8 @@ This package provides macros and scripts to support Java packaging.
%package -n maven-local
Summary: Macros and scripts for Maven packaging support
Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
Requires: javapackages-local = %{version}-%{release}
Requires: %{name} = %{version}
Requires: javapackages-local = %{version}
%description -n maven-local
This package provides macros and scripts to support packaging Maven artifacts.
@ -83,8 +81,9 @@ This package provides macros and scripts to support packaging Maven artifacts.
%package -n ivy-local
Summary: Local mode for Apache Ivy
Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
Requires: javapackages-local = %{version}-%{release}
Requires: %{name} = %{version}
Requires: ant
Requires: javapackages-local = %{version}
%description -n ivy-local
This package implements local mode fow Apache Ivy, which allows
@ -109,7 +108,7 @@ User guide for Java packaging and using utilities from javapackages-tools
%package -n javapackages-local
Summary: Non-essential macros and scripts for Java packaging support
Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{version}
%description -n javapackages-local
This package provides non-essential macros and scripts to support Java packaging.
@ -132,7 +131,7 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
%fdupes %{buildroot}/%{_prefix}
%check
%if 0%{?suse_version} >= 1210
%if 0%{?suse_version} >= 1210
./check
%endif
@ -148,6 +147,7 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
%files -n ivy-local -f files-ivy
%defattr(-,root,root,-)
%dir %{_sysconfdir}/ant.d
%files -n python-javapackages
%defattr(-,root,root,-)