Update to upstream version 2.0~M10

.gitignore

@@ -10,3 +10,4 @@ qdox-1.12-project.tar.bz2
 /qdox-2.0-M7-project.tar.gz
 /qdox-2.0-M9-project.tar.gz
 /qdox-2.0-M9.tar.gz
+/qdox-2.0~M10.tar.gz

generate-tarball.sh

@@ -3,15 +3,14 @@ set -e
 
 name=qdox
 version="$(sed -n 's/Version:\s*//p' *.spec)"
-vertag="$(sed -n 's/%global\s*vertag\s*//p' *.spec)"
 
 # RETRIEVE
-wget "http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/${version}-${vertag}/${name}-${version}-${vertag}-project.tar.gz" -O "${name}-${version}-${vertag}.orig.tar.gz"
+wget "http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/${version/'~'/'-'}/${name}-${version/'~'/'-'}-project.tar.gz" -O "${name}-${version}.orig.tar.gz"
 
 rm -rf tarball-tmp
 mkdir tarball-tmp
 cd tarball-tmp
-tar xf "../${name}-${version}-${vertag}.orig.tar.gz"
+tar xf "../${name}-${version}.orig.tar.gz"
 
 # CLEAN TARBALL
 find -name '*.jar' -delete
@@ -19,6 +18,6 @@ find -name '*.class' -delete
 # contains possibly proprietary binaries of YACC
 rm -r */bootstrap
 
-tar cf "../${name}-${version}-${vertag}.tar.gz" *
+tar cf "../${name}-${version}.tar.gz" *
 cd ..
-rm -r tarball-tmp "${name}-${version}-${vertag}.orig.tar.gz"
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

qdox.spec

@@ -1,15 +1,13 @@
-%global vertag  M9
-
-Summary:        Extract class/interface/method definitions from sources
 Name:           qdox
-Version:        2.0
-Release:        5.%{vertag}%{?dist}
+Version:        2.0~M10
+Release:        1%{?dist}
+Summary:        Extract class/interface/method definitions from sources
 License:        ASL 2.0
 URL:            https://github.com/paul-hammant/qdox
 BuildArch:      noarch
 
 # ./generate-tarball.sh
-Source0:        %{name}-%{version}-%{vertag}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 Source1:        qdox-MANIFEST.MF
 # Remove bundled binaries which are possibly proprietary
 Source2:        generate-tarball.sh
@@ -38,12 +36,9 @@ Summary:        Javadoc for %{name}
 %description javadoc
 API docs for %{name}.
 
-
 %prep
-%setup -q -n %{name}-%{version}-%{vertag}
+%setup -q -n %{name}-%(echo %{version} | tr '~' '-')
 %patch0 -p1
-find -name *.jar -delete
-rm -rf bootstrap
 
 # We don't need these plugins
 %pom_remove_plugin :animal-sniffer-maven-plugin
@@ -65,6 +60,7 @@ jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexe
 %mvn_build -f -- -Dqdox.byaccj.executable=byaccj
 
 # Inject OSGi manifests
+# Even if the version contains the ~ milestone, the output is the same
 jar ufm target/%{name}-%{version}*.jar %{SOURCE1}
 
 %install
@@ -77,6 +73,9 @@ jar ufm target/%{name}-%{version}*.jar %{SOURCE1}
 %doc LICENSE.txt
 
 %changelog
+* Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 2.0~M10-1
+- Update to upstream version 2.0~M10
+
 * Fri Jun 07 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-5.M9
 - Port to JFlex 1.7.0
 

sources

@@ -1 +1 @@
-SHA512 (qdox-2.0-M9.tar.gz) = 739f80beb5c9096774923a29731a93754be9b6d434c2fcdaced70dd2f43f102041c53f6b405b88fa2482f3a8f4e8ede701ffc6b14dcbc77c5030c1e0060149f9
+SHA512 (qdox-2.0~M10.tar.gz) = f0f2c7f5d37bd4d4b20a41bdeb538a4ddb5c303c974a2c1b17be92fcd6875ddd9de2a629c8e724ecef7e318cfb993c8bf6a743fb6fcffc4a2a5cbb9ac4917560