Accepting request 198704 from Java:packages

jpackage-utils collison fix

OBS-URL: https://build.opensuse.org/request/show/198704
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ws-jaxme?expand=0&rev=11
This commit is contained in:
Tomáš Chvátal 2013-09-12 15:04:26 +00:00 committed by Git OBS Bridge
parent 77f30c02ea
commit a2718382a1
2 changed files with 12 additions and 11 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 9 11:06:26 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
-------------------------------------------------------------------
Thu May 14 08:53:05 CEST 2009 - mvyskocil@suse.cz

View File

@ -1,7 +1,7 @@
#
# spec file for package ws-jaxme (Version 0.5.1)
# spec file for package ws-jaxme
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,30 +21,30 @@
Name: ws-jaxme
Version: 0.5.1
Release: 2
Release: 0
Summary: Open source implementation of JAXB
Group: Development/Libraries/Java
License: Apache-2.0
Group: Development/Libraries/Java
Url: http://ws.apache.org/jaxme/
Source0: ws-jaxme-%{version}-src.tar.bz2
Patch0: ws-jaxme-docs_xml.patch
Patch1: ws-jaxme-catalog.patch
Patch2: ws-jaxme-java6.patch
BuildRequires: jpackage-utils >= 1.5.32
BuildRequires: ant >= 1.6
BuildRequires: ant-apache-resolver
BuildRequires: ant-trax
BuildRequires: antlr
BuildRequires: docbook-xsl-stylesheets
BuildRequires: hsqldb
BuildRequires: javapackages-tools
BuildRequires: jaxp_transform_impl
BuildRequires: junit >= 3.8.1
BuildRequires: hsqldb
BuildRequires: log4j
BuildRequires: xalan-j2
BuildRequires: xmldb-api
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
BuildRequires: xml-commons-resolver
BuildRequires: xmldb-api
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -65,7 +65,6 @@ document.
%package javadoc
License: Apache-2.0
Summary: Open source implementation of JAXB
Group: Development/Libraries/Java
@ -86,7 +85,6 @@ document.
%package manual
License: Apache-2.0
Summary: Open source implementation of JAXB
Group: Development/Libraries/Java
@ -168,5 +166,3 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/%{name}-%{version}
%changelog
* Thu May 14 2009 mvyskocil@suse.cz
- Initial SUSE packaging (based on jpackage.org 5.0)