#3 update to version 2.0.0
Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.
Unknown source master  into  master

file modified
+1
@@ -13,3 +13,4 @@

  /qdox-2.0-M7-project.tar.gz

  /qdox-2.0-M9-project.tar.gz

  /qdox-2.0-M9.tar.gz

+ /qdox-2.0.0.tar.gz

file modified
+4 -5
@@ -3,15 +3,14 @@

  

  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 "https://repo1.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 @@

  # 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"

file modified
+9 -6
@@ -1,16 +1,14 @@

- %global vertag  M9

- 

  Summary:        Extract class/interface/method definitions from sources

  Name:           qdox

- Version:        2.0

- Release:        8.%{vertag}%{?dist}

+ Version:        2.0.0

+ Release:        1%{?dist}

  Epoch:          0

  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
@@ -40,8 +38,10 @@

  

  

  %prep

- %setup -q -n %{name}-%{version}-%{vertag}

+ %setup -q

+ 

  %patch0 -p1

+ 

  find -name *.jar -delete

  rm -rf bootstrap

  
@@ -80,6 +80,9 @@

  %doc LICENSE.txt

  

  %changelog

+ * Thu Feb 13 2020 Fabio Valentini <decathorpe@gmail.com> - 0:2.0.0-1

+ - Update to version 2.0.0.

+ 

  * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-8.M9

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@

- SHA512 (qdox-2.0-M9.tar.gz) = 739f80beb5c9096774923a29731a93754be9b6d434c2fcdaced70dd2f43f102041c53f6b405b88fa2482f3a8f4e8ede701ffc6b14dcbc77c5030c1e0060149f9

+ SHA512 (qdox-2.0.0.tar.gz) = b17821fdcfe4daafe76d3f72cc29fd51c27cbf78e07c62c938803b4b0e6855634741f58cab5bba882a9337049da3ee42333b5b43d6398b199091cf344c36a388

Update to latest version (2.0.0) from the 2.0.0~M9 prerelease. Also use HTTPS for downloading sources and adapt the tarball generation script.

Test rebuilds of all dependent packages were successful:

https://copr.fedorainfracloud.org/coprs/decathorpe/qdox-2.0.0-pr/monitor/

All build failures are unrelated and are pre-existing FTBFS issues in rawhide.

rebased onto 7761c3b

4 years ago

rebased onto 2ba0cb8

4 years ago

Pull-Request has been merged by decathorpe

4 years ago