[rpms/treelayout] epel10: Unretire treelayout.

[rpms/treelayout] epel10: Unretire treelayout.

[Jerry James]

A new commit has been pushed.

Repo   : rpms/treelayout
Branch : epel10
Commit : be031defb8d23e238aa7d139b31ac0bc758a768b
Author : Jerry James <loganjerry@gmail.com>
Date   : 2020-02-05T11:29:39-07:00
Stats  : +47/-46 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/treelayout/c/be031defb8d23e238aa7d139b31ac0bc758a768b?branch=epel10

Log:
Unretire treelayout.

---
diff --git a/.gitignore b/.gitignore
index 9f6154c..cb9ab01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/treelayout-1.0.2.tar.xz
-/v1.0.2.tar.gz
-/v1.0.3.tar.gz
+/v*.tar.gz
+/treelayout-*.tar.gz

diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..2c9fb50
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.abego.treelayout</groupId>
+    <artifactId>org.abego.treelayout.project</artifactId>
+    <packaging>pom</packaging>
+    <version>%{version}</version>
+
+    <modules>
+        <module>org.abego.treelayout</module>
+        <module>org.abego.treelayout.demo</module>
+        <!-- Use org.netbeans.api:org-netbeans-api-visual:RELEASE67: -->
+        <!--module>org.abego.treelayout.netbeans</module-->
+        <!--module>org.abego.treelayout.netbeans.demo</module-->
+    </modules>
+</project>

diff --git a/sources b/sources
index e94c13e..1214380 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e5cf46b7488b0b27a876abd20c593f8  v1.0.3.tar.gz
+SHA512 (treelayout-1.0.3.tar.gz) = 5fb6a70206978c6bf8ea3c70603f38049cad21038bcedfd5a7f4dde1e4f8b080bfa78ca6dc2e43a7d0771ded39d5793f0c5340cf60ce63348d28a9be6abc3be4

diff --git a/treelayout.spec b/treelayout.spec
index b792b56..d87dfa1 100644
--- a/treelayout.spec
+++ b/treelayout.spec
@@ -1,73 +1,52 @@
 %global core org.abego.treelayout
+
 Name:          treelayout
 Version:       1.0.3
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       Efficient and customizable Tree Layout Algorithm in Java
 License:       BSD
 URL:           http://treelayout.sourceforge.net/
-Source0:       https://github.com/abego/treelayout/archive/v%{version}.tar.gz
+Source0:       https://github.com/abego/treelayout/archive/v%{version}/%{name}-%{version}.tar.gz
+# Dummy POM to ease building with RPM
+Source1:       pom.xml
 
+BuildArch:     noarch
 BuildRequires: maven-local
 BuildRequires: mvn(junit:junit)
 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
-
-BuildArch:     noarch
 
 %description
-Efficiently create compact, highly customizable
-tree layouts. The software builds tree layouts
-in linear time. I.e. even trees with many nodes
-are built fast.
+Efficiently create compact, highly customizable tree layouts.  The
+software builds tree layouts in linear time; i.e., even trees with many
+nodes are built quickly.
 
-%package demo
+%package       demo
 Summary:       TreeLayout Core Demo
 
-%description demo
+%description   demo
 Demo for "org.abego.treelayout.core".
 
-%package javadoc
+%package       javadoc
 Summary:       Javadoc for %{name}
 
-%description javadoc
+%description   javadoc
 This package contains javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}
-
-# This is a dummy POM added just to ease building in the RPM platforms:
-cat > pom.xml << EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.abego.treelayout</groupId>
-  <artifactId>org.abego.treelayout.project</artifactId>
-  <packaging>pom</packaging>
-  <version>%{version}</version>
-
-  <modules>
-    <module>org.abego.treelayout</module>
-    <module>org.abego.treelayout.demo</module>
-    <!-- Use org.netbeans.api:org-netbeans-api-visual:RELEASE67: -->
-    <!--module>org.abego.treelayout.netbeans</module-->
-    <!--module>org.abego.treelayout.netbeans.demo</module-->
-  </modules>
-
-</project>
-EOF
+%autosetup
+cp -p %{SOURCE1} .
+
+# sonatype-oss-parent is deprecated in Fedora
+%pom_remove_parent %{core} %{core}.demo %{core}.netbeans %{core}.netbeans.demo
 
 # fix non ASCII chars
-native2ascii -encoding UTF8 %{core}/src/main/java/org/abego/treelayout/package-info.java \
- %{core}/src/main/java/org/abego/treelayout/package-info.java
+native2ascii -encoding UTF8 \
+  %{core}/src/main/java/org/abego/treelayout/package-info.java \
+  %{core}/src/main/java/org/abego/treelayout/package-info.java
 
 %mvn_package :%{core}.project __noinstall
 
 %build
-
 %mvn_build -s
 
 %install
@@ -85,6 +64,9 @@ native2ascii -encoding UTF8 %{core}/src/main/java/org/abego/treelayout/package-i
 %license %{core}/src/LICENSE.TXT
 
 %changelog
+* Sat Jan 18 2020 Jerry James <loganjerry@gmail.com> - 1.0.3-10
+- Brought back into Fedora
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild