From 10a9cff4c4fb52a53177de2d610b340a4a9d8725322af22ab0f07c5025fb93dd Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Mon, 11 Jun 2012 05:25:18 +0000 Subject: [PATCH] Accepting request 123432 from home:coolo:branches:openSUSE:Factory - remove stray character from xom summary to fix UTF-8 parsing (the rest is done by format_spec_file) OBS-URL: https://build.opensuse.org/request/show/123432 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jdom?expand=0&rev=11 --- jdom.changes | 5 +++++ jdom.spec | 28 +++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/jdom.changes b/jdom.changes index 7468d9e..4f1b5d3 100644 --- a/jdom.changes +++ b/jdom.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 4 08:41:52 UTC 2012 - coolo@suse.com + +- remove stray character from xom summary to fix UTF-8 parsing + ------------------------------------------------------------------- Thu Mar 17 14:48:00 UTC 2011 - mvyskocil@suse.cz diff --git a/jdom.spec b/jdom.spec index 668aab1..c41a87e 100644 --- a/jdom.spec +++ b/jdom.spec @@ -1,7 +1,8 @@ +# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:foldlevel=42: # # spec file for package jdom # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,7 +16,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define xom_version 1.2b1 %define xom_suffix "" @@ -36,12 +36,11 @@ %define stage1_build_dir %{_builddir}/build Name: jdom +Version: 1.1 +Release: 0 +Summary: JDOM is a Java Representation of an XML Document License: Apache-2.0 Group: Development/Libraries/Java -AutoReqProv: on -Version: 1.1 -Release: 13 -Summary: JDOM is a Java Representation of an XML Document Url: http://www.jdom.org Source0: %{name}-%{version}.tar.bz2 Source1: saxpath-%{saxpath_version}.tar.bz2 @@ -61,11 +60,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: ant BuildRequires: ant-junit +BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: junit BuildRequires: servletapi5 BuildRequires: xalan-j2 BuildRequires: xerces-j2 -BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel BuildRequires: unzip @@ -78,10 +77,10 @@ an alternative to DOM and SAX, although it integrates well with both DOM and SAX. %package -n saxpath -License: Apache-2.0 Version: 1.0_FCS -Release: 275 +Release: 0 Summary: SAXPath is an event-based API for XPath parsers +License: Apache-2.0 Group: Development/Libraries/Java %description -n saxpath @@ -92,10 +91,10 @@ expressions; it does not evaluate them, or even provide an object structure for representing them once they have been parsed. %package -n xom -License: LGPL-2.1+ Version: 1.2b1 -Release: 10 -Summary: XOM™ is a new XML object model +Release: 0 +Summary: XOM is a new XML object model +License: LGPL-2.1+ Group: Development/Languages/Java %description -n xom @@ -135,10 +134,10 @@ Canonical XML. XOM documents can be converted to and from SAX and DOM. %package -n jaxen -License: Apache-2.0 Version: 1.1.1 -Release: 10 +Release: 0 Summary: The jaxen project is a Java XPath Engine +License: Apache-2.0 Group: Development/Libraries/Java %description -n jaxen @@ -243,6 +242,5 @@ rm -rf $RPM_BUILD_ROOT %files -n jaxen %defattr(-,root,root) %{_javadir}/jaxen*.jar -# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:foldlevel=42: %changelog