Accepting request 667392 from Java:packages

Sanitize spec + clean requires + add OSGi manifest entries

OBS-URL: https://build.opensuse.org/request/show/667392
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlgraphics-commons?expand=0&rev=24

xmlgraphics-commons-build_xml.patch

@@ -1,8 +1,15 @@
-Index: build.xml
+--- build.xml	2018-05-14 11:00:43.000000000 +0200
-===================================================================
++++ build.xml	2019-01-19 08:32:11.492539275 +0100
---- build.xml.orig	2010-07-02 14:04:26.000000000 +0200
+@@ -252,6 +252,8 @@
-+++ build.xml	2010-11-03 15:55:01.658901073 +0100
+         <attribute name="Implementation-Version" value="${version}"/>
-@@ -345,20 +345,13 @@
+         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/)"/>
+         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
++        <attribute name="Bundle-SymbolicName" value="org.apache.xmlgraphics"/>
++        <attribute name="Bundle-Version"   value="${version}"/>
+       </manifest>
+       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+     </jar>
+@@ -357,20 +358,13 @@
    </target>
  
    <target name="junit" depends="junit-basic" description="Runs all JUnit tests" if="junit.present">

xmlgraphics-commons.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Jan 19 08:03:42 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * xmlgraphics-commons-build_xml.patch
+    + Add Bundle-SymbolicName and Bundle-Version attributes to
+      generate the right OSGi provides
+- Sanitize spec file and remove unused requires
+
 -------------------------------------------------------------------
 Tue Aug 28 13:44:48 UTC 2018 - tchvatal@suse.com
 

xmlgraphics-commons.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xmlgraphics-commons
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2008, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,7 +13,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,22 +24,16 @@ Summary:        XML Graphics Commons
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            http://xmlgraphics.apache.org/
-Source0:        http://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
 Patch0:         xmlgraphics-commons-build_xml.patch
 Patch1:         xmlgraphics-commons-jdk10.patch
 BuildRequires:  ant >= 1.6.5
-BuildRequires:  ant-junit
+BuildRequires:  commons-io >= 1.1
-BuildRequires:  apache-commons-io >= 1.1
+BuildRequires:  commons-logging
-BuildRequires:  apache-commons-logging
 BuildRequires:  fdupes
-BuildRequires:  gpg2
-# Needed for maven conversions
 BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
+Requires:       mvn(commons-io:commons-io) >= 1.1
-BuildRequires:  junit
+Requires:       mvn(commons-logging:commons-logging)
-BuildRequires:  xmlgraphics-batik
-Requires:       jakarta-commons-io >= 1.1
-Requires:       jakarta-commons-logging
 BuildArch:      noarch
 
 %description
@@ -66,40 +60,27 @@ find . -name "*.jar" | xargs rm
 
 %build
 export CLASSPATH=
-export OPT_JAR_LIST="ant/ant-junit junit"
+build-jar-repository -s lib commons-io commons-logging
-pushd lib
-ln -sf $(build-classpath commons-io) .
-ln -sf $(build-classpath commons-logging) .
-popd
 ant -Djavac.source=1.6 -Djavac.target=1.6 package javadocs
 
 %install
+# jar
 install -Dpm 644 build/%{name}-%{version}.jar \
   %{buildroot}%{_javadir}/%{name}.jar
-
-#
 # pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
-%add_maven_depmap
 
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
-%fdupes -s %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}
-#
-install -dm 755 %{buildroot}%{_docdir}/%{name}
 
-%files
+%files -f .mfiles
-%license LICENSE
+%license LICENSE NOTICE
-%{_javadir}/%{name}.jar
+%doc README
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
 
 %files javadoc
+%license LICENSE NOTICE
 %{_javadocdir}/%{name}
 
 %changelog