- Cleanup with spec-cleaner and add debug output

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jdom?expand=0&rev=14
This commit is contained in:
Tomáš Chvátal 2015-03-24 11:18:06 +00:00 committed by Git OBS Bridge
parent cfa95f48dc
commit ba0e345592
2 changed files with 23 additions and 26 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 24 11:17:50 UTC 2015 - tchvatal@suse.com
- Cleanup with spec-cleaner and add debug output
-------------------------------------------------------------------
Fri Jun 15 12:39:47 UTC 2012 - mvyskocil@suse.cz

View File

@ -1,8 +1,7 @@
# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:foldlevel=42:
#
# spec file for package jdom
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -34,7 +33,6 @@
%define jaxen_dir %{_builddir}/%{name}-%{jdom_version}/jaxen-%{jaxen_version}
%define jdom_dir %{_builddir}/%{name}-%{jdom_version}/%{name}-%{jdom_version}
%define stage1_build_dir %{_builddir}/build
Name: jdom
Version: 1.1
Release: 0
@ -56,18 +54,18 @@ Source4: jaxen-%{jaxen_version}-src.tar.bz2
Patch0: jdom-1.1-build.xml.patch
Patch1: include-glibj.jar.patch
Patch2: jdom-1.1-xom-get-jaxen.patch
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
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
BuildRequires: unzip
BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
JDOM is, quite simply, a Java representation of an XML document. JDOM
@ -133,7 +131,6 @@ XOM includes built-in support for a number of XML technologies
including Namespaces in XML, XPath, XSLT, XInclude, xml:id, and
Canonical XML. XOM documents can be converted to and from SAX and DOM.
%package -n jaxen
Version: 1.1.1
Release: 0
@ -155,13 +152,10 @@ find . -name "*.jar" -delete -name "*.class" -delete
%patch0
%patch1
%patch2
#%patch150 -p1
#<<< prep
#>>> build
%build
LIBGCJ=$(ls /usr/share/java/libgcj* | tail -n1 )
LIBGCJ=$(basename $LIBGCJ)
LIBGCJ=$(ls %{_datadir}/java/libgcj* | tail -n1 )
LIBGCJ=$(basename $LIBGCJ)
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVACMD_OPTS="-C -ftarget=1.5"
export JAVACMD="javac ${JAVACMD_OPTS} "
@ -175,6 +169,7 @@ do
echo compiling class \# $i of ${MAX}
${JAVACMD} -classpath ${CLASSPATH} -d %{stage1_build_dir} $file || FAILED_FILES="$FAILED_FILES $file"
done
echo "Failed files: $FAILED_FILES"
unset CLASSPATH SOURCE_DIRS MAX
pushd %{jdom_dir}
@ -218,30 +213,27 @@ popd
#<<< build
%install
mkdir -p $RPM_BUILD_ROOT/%{_javadir}
mv %{_builddir}/*.jar $RPM_BUILD_ROOT/%{_javadir}
ln -sf %{_javadir}/jdom-%{jdom_version}.jar $RPM_BUILD_ROOT/%{_javadir}/jdom.jar
ln -sf %{_javadir}/jaxen-%{jaxen_version}.jar $RPM_BUILD_ROOT/%{_javadir}/jaxen.jar
ln -sf %{_javadir}/saxpath-%{saxpath_version}.jar $RPM_BUILD_ROOT/%{_javadir}/saxpath.jar
ln -sf %{_javadir}/xom-%{xom_version}.jar $RPM_BUILD_ROOT/%{_javadir}/xom.jar
%clean
rm -rf $RPM_BUILD_ROOT
mkdir -p %{buildroot}/%{_javadir}
mv %{_builddir}/*.jar %{buildroot}/%{_javadir}
ln -sf %{_javadir}/jdom-%{jdom_version}.jar %{buildroot}/%{_javadir}/jdom.jar
ln -sf %{_javadir}/jaxen-%{jaxen_version}.jar %{buildroot}/%{_javadir}/jaxen.jar
ln -sf %{_javadir}/saxpath-%{saxpath_version}.jar %{buildroot}/%{_javadir}/saxpath.jar
ln -sf %{_javadir}/xom-%{xom_version}.jar %{buildroot}/%{_javadir}/xom.jar
%files
%defattr(-,root,root)
%defattr(-,root,root)
%{_javadir}/jdom*.jar
%files -n xom
%defattr(-,root,root)
%defattr(-,root,root)
%{_javadir}/xom*.jar
%files -n saxpath
%defattr(-,root,root)
%defattr(-,root,root)
%{_javadir}/saxpath*.jar
%files -n jaxen
%defattr(-,root,root)
%defattr(-,root,root)
%{_javadir}/jaxen*.jar
%changelog