Accepting request 198937 from Java:packages

- use unversioned javadocdir

OBS-URL: https://build.opensuse.org/request/show/198937
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jakarta-commons-modeler?expand=0&rev=15

jakarta-commons-modeler.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 13 10:58:02 UTC 2013 - pgajdos@suse.com
+
+- use unversioned javadocdir
+
 -------------------------------------------------------------------
 Tue May  8 17:01:16 CEST 2007 - dbornkessel@suse.de
 

jakarta-commons-modeler.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package jakarta-commons-modeler (Version 2.0)
+# spec file for package jakarta-commons-modeler
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -14,13 +14,18 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
-# norootforbuild
 # icecream 0
 
 
 Name:           jakarta-commons-modeler
-BuildRequires:  ant jakarta-commons-digester java2-devel-packages junit mx4j xalan-j2 xml-commons-apis
+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}
@@ -28,7 +33,7 @@ BuildRequires:  ant jakarta-commons-digester java2-devel-packages junit mx4j xal
 %define release		4jpp
 %define	section		free
 Version:        2.0
-Release:        282
+Release:        0
 Summary:        Jakarta Commons Modeler Package
 License:        Apache-2.0
 Group:          Development/Libraries/Java
@@ -36,14 +41,14 @@ Source0:        %{short_name}-%{version}-src.tar.bz2
 #Patch:		%{name}.no-licence.build.patch
 Patch:          %{name}-java14compat.patch
 Url:            http://jakarta.apache.org/commons/modeler/
-Requires:       jaxp_parser_impl
-Requires:       xml-commons-apis
-Requires:       jaxp_transform_impl
-Requires:       mx4j
 Requires:       jakarta-commons-beanutils >= 1.3
 Requires:       jakarta-commons-collections >= 2.0
 Requires:       jakarta-commons-digester >= 1.2
 Requires:       jakarta-commons-logging >= 1.0
+Requires:       jaxp_parser_impl
+Requires:       jaxp_transform_impl
+Requires:       mx4j
+Requires:       xml-commons-apis
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       %{short_name}
@@ -58,7 +63,6 @@ with Model MBean support.
 
 
 %package javadoc
-License:        Apache-2.0
 PreReq:         coreutils
 Summary:        Javadoc for jakarta-commons-modeler
 Group:          Development/Libraries/Java
@@ -91,21 +95,8 @@ export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl jaxp_transf
 (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}-%{version}
+%__mkdir_p %{buildroot}%{_javadocdir}/%{name}
-%__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}
-(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post javadoc
-%__rm -f %{_javadocdir}/%{name}
-%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
-  %__rm -f %{_javadocdir}/%{name}
-fi
 
 %files
 %defattr(0644,root,root,0755)
@@ -114,42 +105,6 @@ fi
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%dir %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}/*
-%ghost %dir %{_javadocdir}/%{name}
 
 %changelog
-* Tue May 08 2007 dbornkessel@suse.de
-- use mx4j instead of jmx
-* Mon Mar 19 2007 dbornkessel@suse.de
-- update to version 2.0 ... needed for newest tomcat55
-  BUG REPORTS ADDRESSED:
-  o MODELER-18   support for general descriptors
-  o MODELER-17   [modeler] MbeansSource don't use args at mbeans and operations
-  o MODELER-16   [modeler] download links broken
-  o MODELER-15   [modeler] IntrospectionUtils memory leak
-  o MODELER-14   After setting an Attribute the Notification Listener will not performed
-  o MODELER-13   [modeler] BaseModelMBean class setModeledType method should be setModelerType
-  o MODELER-12   [modeler] ManagedBean uses the wrong case for ObjectReference
-  o MODELER-11   [modeler] Null Pointer Exception - Non-Singleton Registry
-  o MODELER-10   [modeler] DTD violation when using simple wrapping
-  o MODELER-9    [modeler] Registry.convertValue doesn't support longs
-  o MODELER-8    [modeler] AttributeChangeNotification sent before attribute changes
-  o MODELER-7    sendAttributeChangeNotification on setAttribute
-  o MODELER-6    [modeler] wiki page is immutable and out-of-date
-  o MODELER-5    [modeler] setServer stack overflow
-  o MODELER-4    [modeler] Overloaded operations throw "wrong number of parameters" exception
-  o MODELER-3    [modeler] maven build fails on os x with test failure.
-  o MODELER-2    [modeler] Registry insufficiently synchronized
-  o MODELER-1    ClassNotFoundException while using the Notification
-* Mon Sep 25 2006 skh@suse.de
-- don't use icecream
-- use source="1.4" and target="1.4" for build with java 1.5
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Wed Jul 27 2005 jsmeix@suse.de
-- Adjustments in the spec file.
-* Mon Jul 18 2005 jsmeix@suse.de
-- Current version 1.1 from JPackage.org
-* Sun Sep 05 2004 skh@suse.de
-- Initial package created with version 1.1 (JPackage 1.5)