From 0df4bf579999847136b79f94a3a1b3b4f5ce80fd Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jun 14 2016 20:24:32 +0000
Subject: Cleanup package


---

diff --git a/bsf.spec b/bsf.spec
index 0199cad..4fa1153 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -1,54 +1,23 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# 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.
-#
-
 Name:           bsf
-Version:        2.4.0
-Release:        23%{?dist}
 Epoch:          0
+Version:        2.4.0
+Release:        24%{?dist}
 Summary:        Bean Scripting Framework
 License:        ASL 2.0
 URL:            http://commons.apache.org/bsf/
-Group:          Development/Libraries
+BuildArch:      noarch
+
 Source0:        http://apache.mirror.anlx.net//commons/%{name}/source/%{name}-src-%{version}.tar.gz
 Source1:        %{name}-pom.xml
+
 Patch0:         build-file.patch
 Patch1:	        build.properties.patch
+
 BuildRequires:  javapackages-local
 BuildRequires:  ant
 BuildRequires:  xalan-j2
 BuildRequires:  rhino
 BuildRequires:  apache-commons-logging
-Requires:       xalan-j2
-Requires:       apache-commons-logging
-Requires:       jpackage-utils
-BuildArch:      noarch
 
 %description
 Bean Scripting Framework (BSF) is a set of Java classes which provides
@@ -78,47 +47,39 @@ engines:
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
 %setup -q
-# remove all binary libs
-find . -name "*.jar" -exec %{__rm} -f {} \;
-rm -fr bsf
-
 %patch0 -p1
 %patch1 -p1
+find -name \*.jar -delete
+
+%mvn_file : %{name}
+%mvn_alias : org.apache.bsf:
 
 %build
-export CLASSPATH=$(build-classpath apache-commons-logging xalan-j2 rhino)
-ant jar
-rm -rf bsf/src/org/apache/bsf/engines/java
-ant javadocs
+export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2)
+ant jar javadocs
 
-%install
-# jar
-install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 build/lib/%{name}.jar \
-             %{buildroot}%{_javadir}/%{name}.jar
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_artifact %{SOURCE1} build/lib/%{name}.jar
 
-install -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap -a "org.apache.bsf:%{name}"
+%install
+%mvn_install -J build/javadocs
 
 %files -f .mfiles
-%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
+%license LICENSE.txt NOTICE.txt
+%doc AUTHORS.txt CHANGES.txt README.txt TODO.txt RELEASE-NOTE.txt
 
-%files javadoc
-%doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Jun 14 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.4.0-24
+- Cleanup package
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.4.0-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild