Accepting request 1170982 from Java:packages

Simplify the spec: remove old macros, avoid versioned jars, build javadoc

OBS-URL: https://build.opensuse.org/request/show/1170982
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jdepend?expand=0&rev=22

jdepend-2.10.pom

@@ -2,5 +2,5 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>jdepend</groupId>
   <artifactId>jdepend</artifactId>
-  <version>2.9.1</version>
+  <version>2.10</version>
 </project>

jdepend-2.9.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1381c76064f8e96a7b29b04ba3cb0a6f7ee27b700fd08e358e043bfdd82be1e6
-size 245043

jdepend-target16.patch

@@ -1,29 +0,0 @@
---- build.xml
-+++ build.xml
-@@ -38,7 +38,7 @@
- 
-   <target name="compile" depends="prepare"
-     description="Compiles the source code">
--    <javac srcdir="${src.dir}"
-+    <javac source="1.6" target="1.6" srcdir="${src.dir}"
-            destdir="${build.dir}"
-            debug="${build.debug}">
-       <classpath refid="project.classpath"/>
-@@ -47,7 +47,7 @@
- 
-   <target name="compile-sample" depends="prepare"
-     description="Compiles the sample code">
--    <javac srcdir="sample"
-+    <javac source="1.6" target="1.6" srcdir="sample"
-            destdir="${build.dir}"
-            debug="${build.debug}">
-       <classpath refid="project.classpath"/>
-@@ -57,7 +57,7 @@
-   <target name="compile-tests" depends="compile"
-           if="junit.available"
-     description="Compiles the test code">
--    <javac srcdir="${test.dir}"
-+    <javac source="1.6" target="1.6" srcdir="${test.dir}"
-            destdir="${build.dir}"
-            debug="${build.debug}">
-       <classpath refid="project.classpath"/>

jdepend.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Tue Apr 30 12:06:20 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Simplify the spec:
+  * remove old macros,
+  * avoid versioned jars,
+  * build and distribute javadoc
+
+-------------------------------------------------------------------
+Sat Jun 18 18:38:40 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Clean-up the spec file
+
+-------------------------------------------------------------------
+Sat Mar 19 21:48:11 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Specify the source/target levels 8 on ant invocation
+- Removed patch:
+  * jdepend-target16.patch
+    + not needed with the source/target levels being specified on
+      command-line
+
+-------------------------------------------------------------------
+Tue Dec 28 13:00:04 UTC 2021 - David Anes <david.anes@suse.com>
+
+- Update to 2.10:
+  * Official release that includes support for Java 8 constants
+- Updated license from BSD-3 Clause to MIT (as per LICENSE.md file).
+- Fix installed files permissions (were too broad).
+- Fix LICENSE, CHANGES and README permissions.
+- Fix demo permissions (were too broad).
+- Rebased patches:
+  *  jdepend-target16.patch
+
 -------------------------------------------------------------------
 Tue Nov 27 11:20:17 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 

jdepend.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jdepend
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,19 @@
 #
 
 
-%define section		free
 Name:           jdepend
-Version:        2.9.1
+Version:        2.10
 Release:        0
 Summary:        Java Design Quality Metrics
-License:        BSD-3-Clause
+License:        MIT
 Group:          Development/Libraries/Java
-URL:            http://www.clarkware.com/
-Source0:        %{url}software/%{name}-%{version}.tar.bz2
-Source1:        https://repo1.maven.org/maven2/jdepend/%{name}/%{version}/%{name}-%{version}.pom
-Patch0:         jdepend-target16.patch
+URL:            http://www.clarkware.com/software/JDepend.html
+Source0:        https://github.com/clarkware/jdepend/archive/refs/tags/%{version}.tar.gz
+Source1:        %{name}-%{version}.pom
 BuildRequires:  ant
+BuildRequires:  fdupes
 BuildRequires:  java-devel
-BuildRequires:  javapackages-local
-Obsoletes:      %{name}-javadoc
+BuildRequires:  javapackages-local >= 6
 BuildArch:      noarch
 
 %description
@@ -54,43 +52,51 @@ and control package dependencies.
 
 This package contains demonstration and sample files for JDepend.
 
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation/HTML
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
 %prep
 %setup -q
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
-# fix strange permissions
-find . -type d -exec chmod 755 {} \;
-%patch0 -b .target15
 
 %build
-ant jar
+%{ant} \
+	-Dant.build.javac.source=1.8 \
+	-Dant.build.javac.target=1.8 \
+	jar javadoc
 
 %install
 # jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 dist/%{name}-%{version}.jar \
-    %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
+install -d -m 0755 %{buildroot}%{_javadir}
+install -p -m 0644 dist/%{name}-%{version}.jar \
+    %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -m 655 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
-%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
+install -d -m 0755 %{buildroot}%{_mavenpomdir}
+%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
 
-# demo
+# javadoc
+install -d -m 0755 %{buildroot}%{_javadocdir}
+cp -pr build/docs/api %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
+
+# # demo
 install -d -m 755 %{buildroot}%{_datadir}/%{name}
 cp -pr sample %{buildroot}%{_datadir}/%{name}
+%fdupes -s %{buildroot}%{_datadir}/%{name}
 
-%files
-%license LICENSE
-%doc CHANGES README
-%{_javadir}/*
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
+%files -f .mfiles
+%license LICENSE.md
+%doc CHANGELOG.md README.md
+
+%files javadoc
+%{_javadocdir}/%{name}
 
 %files demo
 %{_datadir}/%{name}