1
0

Accepting request 496983 from Java:packages

- Remove obsolete dep and cleanup with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/496983
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jakarta-commons-modeler?expand=0&rev=18
This commit is contained in:
2017-05-22 08:48:03 +00:00
committed by Git OBS Bridge
2 changed files with 28 additions and 35 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat May 20 18:21:44 UTC 2017 - tchvatal@suse.com
- Remove obsolete dep and cleanup with spec-cleaner
-------------------------------------------------------------------
Fri Sep 13 10:58:02 UTC 2013 - pgajdos@suse.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-modeler
#
# Copyright (c) 2013 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
@@ -14,33 +14,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# icecream 0
Name: jakarta-commons-modeler
BuildRequires: ant
BuildRequires: jakarta-commons-digester
BuildRequires: java2-devel-packages
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: mx4j
BuildRequires: xalan-j2
BuildRequires: xml-commons-apis
%define base_name modeler
%define short_name commons-%{base_name}
%define name jakarta-%{short_name}
%define version 2.0
%define release 4jpp
%define section free
Name: jakarta-commons-modeler
Version: 2.0
Release: 0
Summary: Jakarta Commons Modeler Package
License: Apache-2.0
Group: Development/Libraries/Java
Source0: %{short_name}-%{version}-src.tar.bz2
#Patch: %{name}.no-licence.build.patch
Patch: %{name}-java14compat.patch
Url: http://jakarta.apache.org/commons/modeler/
Source0: %{short_name}-%{version}-src.tar.bz2
Patch0: %{name}-java14compat.patch
BuildRequires: ant
BuildRequires: jakarta-commons-digester
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: mx4j
BuildRequires: xalan-j2
BuildRequires: xml-commons-apis
Requires: jakarta-commons-beanutils >= 1.3
Requires: jakarta-commons-collections >= 2.0
Requires: jakarta-commons-digester >= 1.2
@@ -49,10 +42,10 @@ Requires: jaxp_parser_impl
Requires: jaxp_transform_impl
Requires: mx4j
Requires: xml-commons-apis
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: %{short_name}
Obsoletes: %{short_name}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
The Modeler project creates and maintains a set of Java classes to
@@ -60,10 +53,7 @@ provide a number of facilities for Model MBeans plus unit tests and
small examples of using these facilities to instrument Java classes
with Model MBean support.
%package javadoc
PreReq: coreutils
Summary: Javadoc for jakarta-commons-modeler
Group: Development/Libraries/Java
@@ -76,31 +66,29 @@ classes with Model MBean support.
This package contains the javadoc documentation for the Jakarta Commons
Modeler Package.
%prep
%setup -n %{short_name}-%{version}-src
%patch -p1
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
%build
export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl jaxp_transform_impl mx4j/mx4j-jmx junit commons-beanutils commons-collections commons-digester commons-logging)
%ant dist
ant dist
%install
# jars
%__mkdir_p %{buildroot}%{_javadir}
%__cp -a dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| %__sed "s|jakarta-||g"`; done)
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| %__sed "s|-%{version}||g"`; done)
mkdir -p %{buildroot}%{_javadir}
cp -a dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}
%__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt xdocs
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt xdocs
%{_javadir}/*
%files javadoc