From 47de535b7c99efc4fab51251b885f5a86056fd61d352e3c671bf32c63e39a56f Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 30 Apr 2021 05:27:10 +0000
Subject: [PATCH] Accepting request 889420 from
 home:susnux:branches:Java:packages

- Update to version 2.0.0:
  * No upstream changelog provided

OBS-URL: https://build.opensuse.org/request/show/889420
OBS-URL: https://build.opensuse.org/package/show/Java:packages/qdox?expand=0&rev=33
---
 qdox-2.0-M9-project.tar.gz |  3 ---
 qdox-2.0.0-project.tar.bz2 |  3 +++
 qdox.changes               |  6 ++++++
 qdox.spec                  | 19 +++++++++----------
 4 files changed, 18 insertions(+), 13 deletions(-)
 delete mode 100644 qdox-2.0-M9-project.tar.gz
 create mode 100644 qdox-2.0.0-project.tar.bz2

diff --git a/qdox-2.0-M9-project.tar.gz b/qdox-2.0-M9-project.tar.gz
deleted file mode 100644
index c2025d4..0000000
--- a/qdox-2.0-M9-project.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e73518ba8399434a0f0d54f96e991395edca0ccba555ef9967ef8d94e8201bd
-size 521668
diff --git a/qdox-2.0.0-project.tar.bz2 b/qdox-2.0.0-project.tar.bz2
new file mode 100644
index 0000000..0aa001f
--- /dev/null
+++ b/qdox-2.0.0-project.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57148d2984cf47473365c86d5affe77a38b11f9982cc24456f9dd98cda820bf6
+size 457511
diff --git a/qdox.changes b/qdox.changes
index f6fac01..771313a 100644
--- a/qdox.changes
+++ b/qdox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 29 23:11:06 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 2.0.0:
+  * No upstream changelog provided
+
 -------------------------------------------------------------------
 Mon Apr  8 11:22:57 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/qdox.spec b/qdox.spec
index df61986..cbef1eb 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package qdox
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,14 @@
 #
 
 
-%global vertag  M9
-%global verbase 2.0
 Name:           qdox
-Version:        %{verbase}.%{vertag}
+Version:        2.0.0
 Release:        0
 Summary:        Tool to extract class/interface/method definitions from sources
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://github.com/paul-hammant/qdox
-Source0:        http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/%{verbase}-%{vertag}/%{name}-%{verbase}-%{vertag}-project.tar.gz
+Source0:        http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/%{version}/%{name}-%{version}-project.tar.bz2
 Source1:        qdox-MANIFEST.MF
 BuildRequires:  byaccj
 BuildRequires:  fdupes
@@ -48,11 +46,12 @@ Group:          Development/Libraries/Java
 API docs for %{name}.
 
 %prep
-%setup -q -n %{name}-%{verbase}-%{vertag}
+%setup -q
 find -name *.jar -delete
 find -name *.class -delete
 rm -rf bootstrap
-
+# Fix line endings
+sed -i "s|\r||" README.md
 # We don't need these plugins
 %pom_remove_plugin :animal-sniffer-maven-plugin
 %pom_remove_plugin :maven-failsafe-plugin
@@ -87,10 +86,10 @@ GRAMMAR_PATH=$(pwd)/src/grammar/parser.y && \
 mkdir -p build/classes
 javac -d build/classes -source 6 -target 6 \
   $(find src/main/java -name \*.java)
-jar cf build/%{name}-%{verbase}-%{vertag}.jar -C build/classes .
+jar cf build/%{name}-%{version}.jar -C build/classes .
 
 # Inject OSGi manifests
-jar ufm build/%{name}-%{verbase}-%{vertag}.jar %{SOURCE1}
+jar ufm build/%{name}-%{version}.jar %{SOURCE1}
 
 mkdir -p build/apidoc
 javadoc -d build/apidoc -source 6 -notimestamp $(find src/main/java -name \*.java)
@@ -98,7 +97,7 @@ javadoc -d build/apidoc -source 6 -notimestamp $(find src/main/java -name \*.jav
 %install
 # jar
 install -dm 0755 %{buildroot}%{_javadir}
-install -pm 0644 build/%{name}-%{verbase}-%{vertag}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 0644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
 install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom