From fba57f00ae5b97f035293b7a627a2747fa2e0ca8 Mon Sep 17 00:00:00 2001 From: siddharthvipul Date: Mon, 6 Apr 2020 03:20:01 +0530 Subject: [PATCH] remove python subpackages Signed-off-by: siddharthvipul --- python-docutils.spec | 71 ++++++++++---------------------------------- 1 file changed, 15 insertions(+), 56 deletions(-) diff --git a/python-docutils.spec b/python-docutils.spec index 6ed59f9..0ce3b20 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -2,24 +2,21 @@ Name: python-%{srcname} Version: 0.15.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: System for processing plaintext documentation # See COPYING.txt for information License: Public Domain and BSD and Python and GPLv3+ URL: http://docutils.sourceforge.net -#Source0: http://downloads.sourceforge.net/docutils/%%{srcname}-%%{version}.tar.gz +Source0: http://downloads.sourceforge.net/docutils/%{srcname}-%%{version}.tar.gz # Sometimes we need snapshots. Instructions below: # svn co -r 7687 svn://svn.code.sf.net/p/docutils/code/trunk/docutils # cd docutils # python setup.py sdist # The tarball is in dist/docutils-VERSION.tar.gz -Source0: %{srcname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -34,21 +31,6 @@ Currently, the library supports parsing rST that is in standalone files and PEPs (Python Enhancement Proposals). Work is underway to parse rST from Python inline documentation modules and packages. -%package -n python2-%{srcname} -Summary: System for processing plaintext documentation for python2 -%{?python_provide:%python_provide python2-%{srcname}} - -%description -n python2-%{srcname} -The Docutils project specifies a plaintext markup language, reStructuredText, -which is easy to read and quick to write. The project includes a python -library to parse rST files and transform them into other useful formats such -as HTML, XML, and TeX as well as commandline tools that give the enduser -access to this functionality. - -Currently, the library supports parsing rST that is in standalone files and -PEPs (Python Enhancement Proposals). Work is underway to parse rST from -Python inline documentation modules and packages. - %package -n python3-%{srcname} Summary: System for processing plaintext documentation for python3 %{?python_provide:%python_provide python3-%{srcname}} @@ -70,8 +52,6 @@ This package contains the module, ported to run under python3. %prep %autosetup -c -n %{srcname}-%{version} -# Upstream needs separate python2 and 3 folders as it utilizes 2to3 in -# a custom hackish way pushd %{srcname}-%{version} # Remove shebang from library files @@ -86,7 +66,6 @@ popd # Create the two folders mentioned above mv %{srcname}-%{version} python3 -cp -rp python3 python2 # Get the doc and license files out pushd python3 @@ -102,25 +81,12 @@ rm python3/test/test_writers/test_odt.py %endif %build -pushd python2 -%py2_build -popd - pushd python3 %py3_build popd %install -pushd python2 -%py2_install - -# Flash file is used for testing docutils but shouldn't be in the installed package. -mv docs/user/rst/images/biohazard.swf ./biohazard.swf -popd - -rm -f %{buildroot}/%{_bindir}/* - pushd python3 %py3_install mv docs/user/rst/images/biohazard.swf ./biohazard.swf @@ -136,21 +102,11 @@ done %check -for PY in 2 3; do - pushd python${PY} - mv biohazard.swf docs/user/rst/images/biohazard.swf - python${PY} test${PY/2/}/alltests.py - rm docs/user/rst/images/biohazard.swf - popd -done - - -%files -n python2-%{srcname} -%license COPYING.txt licenses/* -%doc BUGS.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt -%doc THANKS.txt python2/docs editors -%{python2_sitelib}/%{srcname}/ -%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info +pushd python3 +mv biohazard.swf docs/user/rst/images/biohazard.swf +python3 test3/alltests.py +rm docs/user/rst/images/biohazard.swf +popd %files -n python3-%{srcname} @@ -163,6 +119,9 @@ done %changelog +* Sat Apr 04 2020 siddharthvipul - 0.15.2-5 +- Remove python2 subpackage + * Thu Jan 30 2020 Fedora Release Engineering - 0.15.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild @@ -380,16 +339,16 @@ done - Bump for FC6 rebuild. - Remove python byte compilation as this is handled automatically in FC4+. - No longer %%ghost .pyo files. - + * Thu Feb 16 2006 Toshio Kuratomi 0.4-2 - Bump and rebuild for FC5. - + * Sun Jan 15 2006 Toshio Kuratomi 0.4-1 - Update to 0.4. - Scripted the listing of files in the python module. - Add a missingok requirement on python-imaging as docutils can make use of it when converting to formats that have images. - + * Tue Jun 7 2005 Toshio Kuratomi 0.3.9-1 - Update to version 0.3.9. - Use a dist tag as there aren't any differences between supported fc @@ -420,7 +379,7 @@ done from another package.... Lesser of two evils here. - Provide python-docutils in case that package were preinstalled from another repository. - + * Fri Dec 31 2004 Toshio Kuratomi 0:0.3.7-0.fdr.1 - Update to 0.3.7 - Rename from python-docutils to docutils. @@ -428,7 +387,7 @@ done included. In FC3, this won't. - BuildConflict with self since the docutils build detects the presence of roman.py and doesn't reinstall itself. - + * Mon Aug 9 2004 Toshio Kuratomi 0:0.3.5-0.fdr.1 - Update to 0.3.5. - Update spec style to latest fedora-rpmdevtools.