Accepting request 746578 from Java:packages

BuildRequire xerces-j2

OBS-URL: https://build.opensuse.org/request/show/746578
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cpptasks?expand=0&rev=6

cpptasks.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Fri Nov  8 11:56:12 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- BuildRequire xerces-j2, because it is not automatically pulled
+  by ant anymore
+
+-------------------------------------------------------------------
+Wed May 16 10:44:34 UTC 2018 - fstrba@suse.com
+
+- Build with source and target 8 to prepare for a possible removal
+  of 1.6 compatibility
+
+-------------------------------------------------------------------
+Thu Sep 21 14:41:05 UTC 2017 - kkaempf@suse.com
+
+- add /etc/ant.d/cpptasks to let ant find cpptasks easier
+
+-------------------------------------------------------------------
+Mon Sep 18 06:44:19 UTC 2017 - fstrba@suse.com
+
+- Specify java source and target version 1.6 in order to allow
+  building with jdk9
+- Fix rpmlint errors
+- Clean spec file
+
 -------------------------------------------------------------------
 Fri Sep 14 17:53:00 UTC 2012 - dmitry_r@opensuse.org
 

cpptasks.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cpptasks
 #
-# Copyright (c) 2013 SUSE LINUX Products 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,17 +24,16 @@ License:        Apache-2.0
 Group:          Development/Libraries/Java
 Url:            http://ant-contrib.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/ant-contrib/%{name}-%{version}.tar.gz
-
 BuildRequires:  ant
 BuildRequires:  ant-junit
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  jpackage-utils
 BuildRequires:  junit
-
+BuildRequires:  xerces-j2
 Requires:       ant
-Requires:       java
+Requires:       java >= 1.8
-
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This ant task can compile various source languages and produce
@@ -50,13 +49,15 @@ Group:          Documentation/Other
 Javadoc documentation for %{summary}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 find . -name '*.jar' -type f -delete -print
 
 %build
-export OPT_JAR_LIST="ant/ant-junit junit"
+export OPT_JAR_LIST="ant/ant-junit junit xerces-j2"
 export CLASSPATH=""
-%ant jars javadocs
+%{ant} \
+     -Djavac.source=8 -Djavac.target=8 \
+     jars javadocs
 
 %install
 # jars
@@ -65,14 +66,17 @@ ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # javadoc
 install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 cp -pr target/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
 
+mkdir -p %{buildroot}%{_sysconfdir}/ant.d
+echo "cpptasks" > %{buildroot}%{_sysconfdir}/ant.d/cpptasks
+
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*.jar
+%config %{_sysconfdir}/ant.d/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}