diff --git a/xpp3.changes b/xpp3.changes index d6e60fc..b1f658a 100644 --- a/xpp3.changes +++ b/xpp3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 19 16:26:28 UTC 2017 - tchvatal@suse.com + +- Do not require javapackage-tools + ------------------------------------------------------------------- Thu Dec 4 19:34:27 UTC 2014 - p.drouand@gmail.com diff --git a/xpp3.spec b/xpp3.spec index 579d02d..f837b7b 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -1,7 +1,7 @@ # # spec file for package xpp3 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -16,25 +16,22 @@ # -%define section free -Summary: XML Pull Parser -License: Apache-1.1 -Group: Development/Libraries/Java - Name: xpp3 Version: 1.1.4c Release: 0 +Summary: XML Pull Parser +License: Apache-1.1 +Group: Development/Libraries/Java Url: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{version}_src.tgz -Requires: java >= 1.4.2 -Requires: javapackages-tools BuildRequires: ant >= 1.6 BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: perl BuildRequires: xml-commons-apis -BuildArch: noarch +Requires: java >= 1.4.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Xml Pull Parser 3rd Edition (XPP3) MXP1 is a new XmlPull parsing engine @@ -75,17 +72,17 @@ ant xpp3 junit apidoc %install # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} +mkdir -p %{buildroot}%{_javadir} cp -p build/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + %{buildroot}%{_javadir}/%{name}-%{version}.jar cp -p build/%{name}_min-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-minimal-%{version}.jar + %{buildroot}%{_javadir}/%{name}-minimal-%{version}.jar cp -p build/%{name}_xpath-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-xpath-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}%{_javadir}/%{name}-xpath-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name} rm -rf doc/{build.txt,api} %files