Accepting request 671937 from Java:packages

- Clean the spec file and sanitize dependencies

OBS-URL: https://build.opensuse.org/request/show/671937
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bsf?expand=0&rev=29

bsf.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb  5 16:30:07 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Clean the spec file and sanitize dependencies
+
 -------------------------------------------------------------------
 Tue Nov 27 09:13:05 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 

bsf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bsf
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Bean Scripting Framework
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-Url:            http://commons.apache.org/bsf/
+URL:            http://commons.apache.org/bsf/
 Source0:        http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{version}.tar.gz
 Source1:        bsf-pom.xml
 Source1000:     http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{version}.tar.gz.asc
@@ -34,10 +34,9 @@ BuildRequires:  apache-commons-logging
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
 BuildRequires:  rhino
 BuildRequires:  xalan-j2
-BuildRequires:  xml-commons-apis
+Requires:       mvn(commons-logging:commons-logging)
 BuildArch:      noarch
 
 %description
@@ -83,12 +82,9 @@ Framework.
 
 %prep
 %setup -q
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-rm -fr bsf
-
 %patch0 -p1
 %patch1 -p1
+find -name \*.jar -delete
 
 %build
 mkdir -p lib
@@ -110,14 +106,12 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
-%files
-%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_datadir}/maven-metadata/%{name}.xml
+%files -f .mfiles
+%license LICENSE.txt NOTICE.txt
+%doc AUTHORS.txt CHANGES.txt README.txt TODO.txt RELEASE-NOTE.txt
 
 %files javadoc
-%dir %{_javadocdir}/%{name}
+%license LICENSE.txt NOTICE.txt
 %{_javadocdir}/%{name}
 
 %changelog