From cedc2e9e769aa552ca5af6954350f158567cc70b Mon Sep 17 00:00:00 2001
From: jandrlik <jandrlik@redhat.com>
Date: Feb 20 2020 15:06:44 +0000
Subject: - Migrated from deprecated add_maven_depmap macro https://docs.fedoraproject.org/en-US/java-packaging-howto/migration/

- renamed pom.xml to swing_layout.pom in sake of some coherence
- deleted commented javadoc chunks of code and unsatisfiable if statements
- tried to find new url of sources, but with no luck, upstream is non-existent

---

diff --git a/swing-layout-pom.xml b/swing-layout-pom.xml
index 396a02c..cd35b3e 100644
--- a/swing-layout-pom.xml
+++ b/swing-layout-pom.xml
@@ -85,7 +85,8 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
+	    <version>3.8.2</version>
+	    <scope>test</scope>
         </dependency>
 
     </dependencies>
diff --git a/swing-layout.spec b/swing-layout.spec
index 462ab84..2730339 100644
--- a/swing-layout.spec
+++ b/swing-layout.spec
@@ -5,6 +5,7 @@ Summary:        Natural layout for Swing panels
 License:        LGPLv2
 URL:            https://swing-layout.dev.java.net/
 # https://svn.java.net/svn/swing-layout~svn/trunk/
+# the above urls are dead, since the upstream project doesn't exist anymore
 Source0:        %{name}-%{version}-src.zip
 # from http://java.net/jira/secure/attachment/27303/pom.xml
 Source1:        %{name}-pom.xml
@@ -12,25 +13,18 @@ Source1:        %{name}-pom.xml
 Patch0:         %{name}-%{version}-project_properties.patch
 Patch1:         %{name}-%{version}-fix-incorrect-fsf-address.patch
 
-BuildRequires:  jpackage-utils >= 1.6
+BuildRequires:  junit >= 3.8.2
+BuildRequires:  javapackages-local
 BuildRequires:  java-devel >= 1.3
 BuildRequires:  ant
 BuildRequires:  dos2unix
-Requires:       java >= 1.3
+Requires:       java-headless >= 1.3
 
 BuildArch:      noarch
 
 %description
 Extensions to Swing to create professional cross platform layout.
 
-%if 0
-%package javadoc
-Summary:        Javadoc documentation for Swing Layout
-
-%description javadoc
-Documentation for Swing Layout code.
-%endif
-
 %prep
 %setup -q
 dos2unix releaseNotes.txt
@@ -38,51 +32,31 @@ dos2unix releaseNotes.txt
 %patch1 -p0
 sed -i 's/\r//' COPYING
 
-cp -p %{SOURCE1} pom.xml
-sed -i "s|<version>1.0.3</version>|<version>%{version}</version>|" pom.xml
+cat %{SOURCE1} | sed "s|<version>1.0.3</version>|<version>%{version}</version>|"  >  %{name}.pom
 
 %build
 
-%{ant} jar \
-#   [javadoc] Loading source files for package org.jdesktop.layout...
-#   [javadoc] 1 error
-#   [javadoc] java.lang.IllegalStateException: endPosTable already set
-%if 0
- javadoc dist
-%endif
- 
-%install
+%{ant} jar 
+%mvn_artifact %{name}.pom dist/%{name}.jar
 
-mkdir -p %{buildroot}%{_javadir}
+%install
 
-%if 0
-install -m 644 dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%else
-install -m 644 dist/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-%endif
+%mvn_install -J dist/javadoc
 
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
-%if 0
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
-%endif
+%check
+%{ant} test
 
 %files -f .mfiles
 %doc releaseNotes.txt
 %license COPYING
 
-%if 0
-%files javadoc
-%{_javadocdir}/%{name}
-%license COPYING
-%endif
-
 %changelog
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Tue Feb 18 2020 Jiri Andrlik <jandrlik@redhat.com> - 1.0.4-18
+- Migrated from deprecated add_maven_depmap macro https://docs.fedoraproject.org/en-US/java-packaging-howto/migration/
+- renamed pom.xml to swing_layout.pom in sake of some coherence 
+- deleted commented javadoc chunks of code and unsatisfiable if statements
+- tried to find new url of sources, but with no luck, upstream is non-existent
 
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild