OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-chainsaw?expand=0&rev=2

apache-chainsaw.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package apache-chainsaw
+# spec file
 #
 # Copyright (c) 2022 SUSE LLC
 #
@@ -24,10 +24,11 @@ Release:        0
 Summary:        Apache Chainsaw
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            https://logging.apache.org/chainsaw
+URL:            https://logging.apache.org/%{short_name}
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-tools
 BuildRequires:  maven-local
 BuildRequires:  mvn(ant-contrib:ant-contrib)
 BuildRequires:  mvn(com.jcraft:jsch)
@@ -35,13 +36,27 @@ BuildRequires:  mvn(com.thoughtworks.xstream:xstream)
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(javax.jmdns:jmdns)
 BuildRequires:  mvn(log4j:apache-log4j-extras)
-BuildRequires:  mvn(log4j:log4j:1.2.16)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.commons:commons-vfs2)
 BuildRequires:  mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec)
+BuildRequires:  mvn(org.apache.logging.log4j:log4j-1.2-api)
 BuildRequires:  mvn(org.apache.logging:logging-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+#!BuildIgnore:  log4j
+Requires:       apache-commons-logging
+Requires:       apache-commons-vfs2
+Requires:       apache-log4j-extras
+Requires:       javapackages-tools
+Requires:       jmdns
+Requires:       jsch
+Requires:       log4j12
+Requires:       slf4j
+Requires:       xpp3
+Requires:       xpp3-minimal
+Requires:       xstream
+Provides:       chainsaw = %{version}-%{release}
+Obsoletes:      chainsaw < %{version}-%{release}
 BuildArch:      noarch
 
 %description
@@ -61,13 +76,14 @@ Group:          Documentation/HTML
 %pom_remove_plugin :appassembler-maven-plugin
 %pom_remove_plugin :maven-assembly-plugin
 
+# use apache-commons-vfs2 instead of the old apache-commons-vfs
 %pom_change_dep :commons-vfs org.apache.commons:commons-vfs2
 perl -pi -e 's#org\.apache\.commons\.vfs\.#org\.apache\.commons\.vfs2\.#g' \
   src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
 %pom_remove_dep org.apache.openejb:javaee-api
 %pom_remove_dep org.projectlombok:lombok
 
-
+%pom_change_dep log4j:log4j org.apache.logging.log4j:log4j-1.2-api
 
 %build
 %{mvn_build} -f -- -Dsource=8
@@ -76,7 +92,11 @@ perl -pi -e 's#org\.apache\.commons\.vfs\.#org\.apache\.commons\.vfs2\.#g' \
 %mvn_install
 %fdupes -s %{buildroot}%{_javadocdir}
 
+# apache-chainsaw has to be the first in order to avoid name classes in apache-log4j-extras
+%jpackage_script org.apache.log4j.chainsaw.LogUI "" "" apache-chainsaw:apache-log4j-extras:log4j12:jmdns:slf4j/api:xstream:xpp3:xpp3-minimal:commons-vfs2:commons-logging:jsch %{short_name} true
+
 %files -f .mfiles
+%{_bindir}/%{short_name}
 %license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc