Accepting request 678586 from Java:packages

Distribute pom file and javadoc + cleanup

OBS-URL: https://build.opensuse.org/request/show/678586
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/oro?expand=0&rev=20

oro-2.0.8.pom

@@ -0,0 +1,6 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>oro</groupId>
+  <artifactId>oro</artifactId>
+  <version>2.0.8</version>
+</project>

oro.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 14 08:46:56 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Add the maven pom file
+- Build and distribute the api documentation too
+
 -------------------------------------------------------------------
 Sun Sep 10 07:06:34 UTC 2017 - fstrba@suse.com
 

oro.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package oro
 #
-# Copyright (c) 2017 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
@@ -12,7 +12,7 @@
 # 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -24,11 +24,13 @@ Summary:        Full regular expressions API
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 Url:            http://jakarta.apache.org/oro/
-Source0:        %{full_name}-%{version}.tar.gz
+Source0:        http://archive.apache.org/dist/jakarta/oro/%{full_name}-%{version}.tar.gz
+Source1:        http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 BuildRequires:  ant
+BuildRequires:  fdupes
+BuildRequires:  javapackages-local
 BuildRequires:  xml-commons-apis
 Provides:       %{full_name} = %{version}-%{release}
-Obsoletes:      %{name}-javadoc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -43,6 +45,13 @@ the Jakarta Project by Daniel Savarese (www.savarese.org), the
 copyright holder of the ORO libraries. Daniel will continue to
 participate in their development under the Jakarta Project.
 
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Development/Libraries/Java
+
+%description javadoc
+Javadoc for %{name}.
+
 %prep
 %setup -q -n %{full_name}-%{version}
 # remove all binary libs
@@ -54,18 +63,29 @@ for file in `find . -type f -name .cvsignore`; do rm -rf $file; done
 %build
 ant \
 	-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-	-Dfinal.name=%{name} jar
+	-Dfinal.name=%{name} jar javadocs
 
 %install
-#jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in oro*.jar; do ln -sf ${jar} jakarta-${jar}; done)
+# jar
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 0644 %{name}.jar %{buildroot}%{_javadir}/
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{full_name}.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}
+install -pm 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes %{buildroot}%{_javadocdir}
 
-%files
-%defattr(-,root,root)
-%doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE
-%{_javadir}/*.jar
+%files -f .mfiles
+%doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS STYLE
+%license LICENSE
+%{_javadir}/%{full_name}.jar
+
+%files javadoc
+%license LICENSE
+%{_javadocdir}/%{name}
 
 %changelog