- Cleanup a bit to be acceptable.

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-jxpath?expand=0&rev=2

apache-commons-jxpath.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 18 13:26:09 UTC 2014 - tchvatal@suse.com
+
+- Cleanup a bit to be acceptable.
+
 -------------------------------------------------------------------
 Tue Dec 20 14:32:13 UTC 2011 - dmacvicar@suse.de
 

apache-commons-jxpath.spec

@@ -1,45 +1,52 @@
+#
+# spec file for package apache-commons-jxpath
+#
+# 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
 %define base_name       jxpath
 %define short_name      commons-%{base_name}
-
-Name:             apache-%{short_name}
-Version:          1.3
-Release:          0
-Summary:          Simple XPath interpreter
-
-Group:            Development/Libraries/Java
-License:          ASL 2.0
-URL:              http://commons.apache.org/%{base_name}/
-Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-# Depmap needed to bend servlet-api and jsp-api to tomcat6
-Source1:          %{short_name}.depmap
-Patch0:           %{short_name}-mockrunner.patch
-Patch1:           build.xml.patch
-BuildArch:        noarch
-
-BuildRequires:    ant
-BuildRequires:    jdom
-BuildRequires:    java-devel >= 1.6.0
-BuildRequires:    jpackage-utils
-BuildRequires:    junit
-BuildRequires:    apache-commons-beanutils
-BuildRequires:    servlet25
-BuildRequires:    jsp
-BuildRequires:    el_api
-
-Requires:         java >= 1.6.0
-Requires:         jpackage-utils
-Requires:         jdom >= 1.0
-Requires:         apache-commons-beanutils
-Requires:         apache-commons-logging
-
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
-
-BuildRoot:        %{_tmppath}/%{name}-%{version}-build
-
-# This should go away with F-17
-Provides:         jakarta-%{short_name} = %{version}-%{release}
-Obsoletes:        jakarta-%{short_name} < %{version}-%{release}
+Name:           apache-%{short_name}
+Version:        1.3
+Release:        0
+Summary:        Simple XPath interpreter
+License:        Apache-2.0
+Group:          Development/Libraries/Java
+Url:            http://commons.apache.org/%{base_name}/
+Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source1:        %{short_name}.depmap
+Patch0:         %{short_name}-mockrunner.patch
+Patch1:         build.xml.patch
+BuildRequires:  ant
+BuildRequires:  apache-commons-beanutils
+BuildRequires:  el_api
+BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  jdom
+BuildRequires:  javapackages-tools
+BuildRequires:  jsp
+BuildRequires:  junit
+BuildRequires:  servlet3
+Requires:       apache-commons-beanutils
+Requires:       apache-commons-logging
+Requires:       java >= 1.6.0
+Requires:       jdom >= 1.0
+Requires:       javapackages-tools
+Provides:       jakarta-%{short_name} = %{version}-%{release}
+Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 Defines a simple interpreter of an expression language called XPath.
@@ -62,12 +69,11 @@ export CLASSPATH=$(build-classpath \
                    target/commons-jxpath.jar \
                   ):target/classes:target/test-classes
 ant -Dmaven.mode.offline=true jar \
-    -lib /usr/share/java
+    -lib %{_datadir}/java
 
 %install
-export NO_BRP_CHECK_BYTECODE_VERSION=true
-install -Dpm 644 target/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}
+install -Dpm 644 target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+pushd %{buildroot}%{_javadir}
 for jar in *-%{version}*; do
     ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
     ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`