From 802925718b271a2ae54d3d9a84cbe240bbc31cad Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 29 Jun 2019 13:22:24 -0700 Subject: [PATCH] Remove non free docs from src.rpm and provide script to do so before upload. Fixes bug #1684335 --- .gitignore | 1 + generate-tarball.sh | 8 ++++++++ python-waitress.spec | 19 ++++++++++++++++--- sources | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100755 generate-tarball.sh diff --git a/.gitignore b/.gitignore index e1847d7..736efc2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /waitress-1.0.2.tar.gz /waitress-1.1.0.tar.gz /v1.2.1.tar.gz +/v1.2.1-nodocs.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..f45f570 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +VERSION=$1 + +tar -xzvf v$VERSION.tar.gz +rm -rf waitress-$VERSION/docs +mv waitress-$VERSION waitress-$VERSION-nodocs +tar -czvf v$VERSION-nodocs.tar.gz waitress-$VERSION-nodocs diff --git a/python-waitress.spec b/python-waitress.spec index 6e1a4f6..82226ce 100644 --- a/python-waitress.spec +++ b/python-waitress.spec @@ -4,12 +4,21 @@ Name: python-%{srcname} Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Waitress WSGI server License: ZPLv2.1 URL: https://github.com/Pylons/%{srcname} -Source0: %{url}/archive/v%{version}.tar.gz +Source0: v%{version}-nodocs.tar.gz +# Upstream ships non free docs files. +# We do not even want them in our src.rpms +# So we remove them before uploading. +# +# Download the upstream tarball and invoke this script while in the +# tarball's directory: +# ./generate-tarball.sh 1.0 +# +Source1: generate-tarball.sh BuildArch: noarch @@ -48,7 +57,7 @@ BuildRequires: python3-coverage Python 3 version. %prep -%autosetup -n %{srcname}-%{version} +%autosetup -n %{srcname}-%{version}-nodocs %build %py2_build @@ -76,6 +85,10 @@ Python 3 version. %{python3_sitelib}/%{srcname}-*.egg-info/ %changelog +* Sat Jun 29 2019 Kevin Fenzi - 1.2.1-2 +- Remove non free docs from src.rpm and provide script to do so before upload. +- Fixes bug #1684335 + * Tue Feb 05 2019 Lorenzo Gil Sanchez - 1.2.1-1 - Update to 1.2.1 (#1667466) diff --git a/sources b/sources index a177614..6d99ee9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.2.1.tar.gz) = 6c06fb799aa277a5e53fc085de3e284c558327f3df7fd2f06771e87f741bdf911a8e0ed2f13f7aa115ab13d4364da27b54984592db6ce3a4326723a7d4c7f7c3 +SHA512 (v1.2.1-nodocs.tar.gz) = 1bea7eae80b4eb506516587a661c8f1aec179c2db542178ad65beec3faae70ce5ab504b970ee43a9745883d535ad0551b7bf88eeda513443dbf493a3efa1fd14