From 0e0e885f1d5067d15d9e63f218dd87b1ef4711948c23481311a6ecbe951545ad Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 16 Nov 2010 15:11:57 +0000 Subject: [PATCH 1/2] - correct fop Provides: Obsolete: OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=5 --- xmlgraphics-fop.changes | 5 ++ xmlgraphics-fop.spec | 163 ++++++++++++++++++++++++++++++++++------ 2 files changed, 146 insertions(+), 22 deletions(-) diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes index 996c792..53db359 100644 --- a/xmlgraphics-fop.changes +++ b/xmlgraphics-fop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 16 15:11:29 UTC 2010 - mvyskocil@suse.cz + +- correct fop Provides: Obsolete: + ------------------------------------------------------------------- Wed Nov 3 13:11:50 UTC 2010 - mvyskocil@suse.cz diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec index 2780caf..a914546 100644 --- a/xmlgraphics-fop.spec +++ b/xmlgraphics-fop.spec @@ -1,20 +1,31 @@ -# -# spec file for package xmlgraphics-fop (Version 1.0) -# -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # All rights reserved. # -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # norootforbuild @@ -26,7 +37,7 @@ Name: xmlgraphics-fop Version: 1.0 Release: 1 Summary: Formatter for Printing XSLT Processed XML Files -License: ASLv.. +License: The Apache Software License Group: Productivity/Publishing/XML Source0: http://www.apache.org/dist/xmlgraphics/fop/source/fop-%{version}-src.tar.gz #FIX-OPENSUSE: add xmlgraphics-commons to classpath @@ -34,7 +45,7 @@ Source1: %{name}.script Source2: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/xmlgraphics-fop-pom-template.pom Patch0: xmlgraphics-fop-build.patch Patch1: xmlgraphics-fop-cli.patch -Url: http://xmlgraphics.apache.org/fop/ +URL: http://xmlgraphics.apache.org/fop/ Requires(post): jpackage-utils >= 1.7.4 Requires(postun): jpackage-utils >= 1.7.4 Requires: jpackage-utils >= 1.7.4 @@ -66,11 +77,11 @@ BuildRequires: xmlgraphics-commons >= 1.2 BuildRequires: xmlunit BuildRequires: xml-commons-jaxp-1.3-apis BuildRequires: qdox -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildArch: noarch #!BuildIgnore: saxon -Provides: %{bname} = %{name}-%{version} -Obsoletes: %{bname} < %{name}-%{version} +Provides: %{bname} = %{version}-%{release} +Obsoletes: %{bname} < %{version}-%{version} %description FOP (Formatting Objects Processor) is driven by XSL formatting objects @@ -80,7 +91,6 @@ formats: PDF (primary output target), PCL, PS, SVG, XML (area tree representation), Print, AWT, MIF, and TXT. %package javadoc -License: ASLv.. Summary: Javadoc for %{name} Group: Documentation/HTML @@ -169,7 +179,6 @@ rm -rf $RPM_BUILD_ROOT %postun %update_maven_depmap - %files %defattr(0644,root,root,0755) %doc NOTICE LICENSE README known-issues.xml status.xml @@ -187,3 +196,113 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name} %changelog +* Tue May 26 2009 David Walluck 0:0.95-6 +- cleanup + +* Fri Sep 12 2008 David Walluck 0:0.95-5 +- fix java-devel requires + +* Sun Aug 10 2008 David Walluck 0:0.95-4 +- fix fop script + +* Fri Aug 01 2008 David Walluck 0:0.95-3 +- GCJ fixes + +* Fri Aug 01 2008 David Walluck 0:0.95-2 +- add new cli patch + +* Thu Jul 31 2008 David Walluck 0:0.95-1 +- 0.95 + +* Thu Jul 31 2008 David Walluck 0:0.94-4 +- update and rebuild for xmlgraphics-batik +- patch cli to look for xmlgraphics-fop.jar in addition to fop.jar + +* Thu Jul 17 2008 David Walluck 0:0.94-4 +- remove javadoc scriptlets +- GCJ fixes +- fix maven directory ownership +- update BuildRoot +- update License +- remove Vendor and Distribution + +* Tue Mar 18 2008 Ralph Apel - 0:0.94-3jpp +- Fix classpath in script +- (B)R xerces, xalan, xml-commons-jaxp-a.3-apis + +* Tue Feb 26 2008 Ralph Apel - 0:0.94-2jpp +- Replace avalon-framework with excalibur-avalon-framework-{api,impl} + +* Mon Feb 25 2008 Ralph Apel - 0:0.94-1jpp +- Derived 0.94 from 0.20.5 keep this as "fop" +- Add pom and depmap frag +- Activate tests + +* Fri May 11 2007 Ralph Apel - 0:0.20.5-12jpp +- Rebuild taking care of arch for src.rpm + +* Thu May 10 2007 Ralph Apel - 0:0.20.5-11jpp +- Make Vendor, Distribution based on macro + +* Thu Feb 22 2007 Ralph Apel - 0:0.20.5-10jpp +- Add gcj_support option + +* Thu Mar 30 2006 Ralph Apel - 0:0.20.5-9jpp +- First build for JPP-1.7 +- Replace avalon-framework, avalon-logkit with their new excalibur-* + counterparts +- Drop non-free jimi and jai BRs + +* Tue Oct 11 2005 Ralph Apel - 0:0.20.5-8jpp +- Patch to Batik >= 1.5.1 + +* Fri Oct 07 2005 Ralph Apel - 0:0.20.5-7jpp +- Omit ant -d flag + +* Mon Aug 23 2004 Ralph Apel - 0:0.20.5-6jpp +- Build with ant-1.6.2 + +* Fri Aug 06 2004 Ralph Apel - 0:0.20.5-5jpp +- Void change + +* Tue Jun 01 2004 Randy Watler - 0:0.20.5-4jpp +- Upgrade to Ant 1.6.X + +* Thu Jan 8 2004 Ville Skyttä - 0:0.20.5-3jpp +- BuildRequires ant-optional. +- Crosslink with full J2SE javadocs instead of just JAXP/XML-commons. +- Add Main-Class back to manifest. + +* Tue Sep 23 2003 Paul Nasrat - 0:0.20.5-2jpp +- Fix script and requires +- Remove class path in manifest +- New javadoc style + +* Sat Jul 19 2003 Ville Skyttä - 0:0.20.5-1jpp +- Update to 0.20.5. +- Crosslink with xml-commons-apis and batik javadocs. +- BuildRequires jai, jce and jimi. + +* Sat Jun 7 2003 Ville Skyttä - 0:0.20.5-0.rc3a.1jpp +- Update to 0.20.5rc3a. +- Include fop script. +- Non-versioned javadoc symlinks. + +* Thu Apr 17 2003 Ville Skyttä - 0:0.20.5-0.rc2.1jpp +- Update to 0.20.5rc2 and JPackage 1.5. + +* Sun Mar 10 2002 Guillaume Rousse 0.20.3-1jpp +- 0.20.3 final +- fixed missing symlink + +* Mon Jan 21 2002 Guillaume Rousse 0.20.3-0.rc.1jpp +- 0.20.3rc +- first unified release +- javadoc into javadoc package +- no dependencies for manual package +- s/jPackage/JPackage +- adaptation to new xalan-j2 package +- requires and buildrequires avalon-logkit + +* Thu Aug 30 2001 Guillaume Rousse 0.20.1-1mdk +- first release From a7e25d10683cbcc28acab1a83ac68dbed97e2edad105986b70cf604404567a55 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Thu, 18 Nov 2010 13:28:08 +0000 Subject: [PATCH 2/2] definitive fix of provides/obsoletes OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=6 --- xmlgraphics-fop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec index a914546..3a9859f 100644 --- a/xmlgraphics-fop.spec +++ b/xmlgraphics-fop.spec @@ -81,7 +81,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch #!BuildIgnore: saxon Provides: %{bname} = %{version}-%{release} -Obsoletes: %{bname} < %{version}-%{version} +Obsoletes: %{bname} < %{version}-%{release} %description FOP (Formatting Objects Processor) is driven by XSL formatting objects