From 2cd56ecb3baa68650eea46757bf4eadc9153ef2156aade1efe7f048cf38294b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 7 Jul 2014 12:34:46 +0000 Subject: [PATCH] - Cleanup with spec-cleaner and fix build with xerces-j2-xml-apis OBS-URL: https://build.opensuse.org/package/show/Java:packages/adaptx?expand=0&rev=9 --- adaptx.changes | 5 ++++ adaptx.spec | 78 +++++++++++--------------------------------------- 2 files changed, 22 insertions(+), 61 deletions(-) diff --git a/adaptx.changes b/adaptx.changes index ab34962..687ed41 100644 --- a/adaptx.changes +++ b/adaptx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 7 12:34:21 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner and fix build with xerces-j2-xml-apis + ------------------------------------------------------------------- Mon Sep 9 11:04:07 UTC 2013 - tchvatal@suse.com diff --git a/adaptx.spec b/adaptx.spec index f41331d..41282a6 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -1,7 +1,7 @@ # # spec file for package adaptx # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,60 +16,49 @@ # -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} -%define section free - Name: adaptx Version: 0.9.13 Release: 0 Summary: XSLT Processor Written in Java License: BSD-3-Clause Group: Development/Libraries/Java +Url: http://castor.exolab.org/ Source0: %{name}-%{version}-src.tar.bz2 # svn export http://svn.codehaus.org/castor/adaptx Patch0: %{name}-%{version}-xsl.patch Patch1: %{name}-%{version}-icedtea-build.patch -Url: http://castor.exolab.org/ BuildRequires: ant >= 1.6 BuildRequires: javapackages-tools BuildRequires: log4j BuildRequires: xerces-j2 +BuildRequires: xerces-j2-xml-apis BuildRequires: xml-commons-apis -%if %defined suse_version -BuildRequires: java-devel -%endif Requires: ant >= 1.6 Requires: javapackages-tools Requires: log4j Requires: xerces-j2 Requires: xml-commons-apis -%if ! %{gcj_support} -BuildArch: noarch -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat +BuildArch: noarch +%if %{defined} suse_version +BuildRequires: java-devel %endif %description AdaptX is an extensible stylesheet language (XSL) processor. - - %package javadoc -PreReq: coreutils Summary: Javadoc for adaptx Group: Development/Libraries/Java -Requires(post): /bin/rm,/bin/ln +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: coreutils +Requires(post): /bin/ln +Requires(post): /bin/rm Requires(postun): /bin/rm %description javadoc This package contains the javadoc documentation for AdaptX. - - %package doc Summary: Documentation for adaptx Group: Development/Libraries/Java @@ -77,8 +66,6 @@ Group: Development/Libraries/Java %description doc This package contains the documentation for AdaptX. - - %prep %setup -q -n %{name}-%{version}-src # remove CVS internal files @@ -93,56 +80,25 @@ done %build perl -p -i -e 's|classic|modern|' src/build.xml #export CLASSPATH=$(build-classpath js log4j xerces-j2 xml-commons-apis) -export CLASSPATH=$(build-classpath xml-commons-apis log4j xerces-j2) +export CLASSPATH=$(build-classpath xml-commons-apis log4j xerces-j2 xerces-j2-xml-apis) ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -buildfile src/build.xml jar javadoc CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -buildfile src/build.xml doc %install # jar -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 dist/%{name}_%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done) +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 dist/%{name}_%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done) # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr build/doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} rm -rf build/doc/javadoc -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi -%if %{gcj_support} - -%post -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif -%if %{gcj_support} - -%postun -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %files %defattr(0664,root,root,0755) -%doc src/etc/{CHANGELOG,contributors.html,LICENSE} +%doc src%{_sysconfdir}/{CHANGELOG,contributors.html,LICENSE} %{_javadir}/* -%if %{gcj_support} -%attr(-,root,root) %{_libdir}/gcj/%{name} -%endif %files javadoc %defattr(0664,root,root,0755)