diff --git a/.gitignore b/.gitignore index 0c618f8..89b9b6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/rjsmin-1.0.12.tar.gz -/rjsmin-1.1.0.tar.gz -/rjsmin-1.2.0.tar.gz +/rjsmin-*.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..1e3331b --- /dev/null +++ b/changelog @@ -0,0 +1,85 @@ +* Fri Jul 22 2022 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 06 2022 Armando Neto - 1.2.0-1 +- Update to 1.2.0 + +* Mon Jun 13 2022 Python Maint - 1.1.0-6 +- Rebuilt for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Aug 05 2021 Matthias Runge - 1.1.0-4 +- Fix FTBFS, skip docs build. (rhbz#1977642) + +* Fri Jun 04 2021 Python Maint - 1.1.0-3 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Sep 08 2020 Yatin Karel - 1.1.0-1 +- Update to 1.1.0 + +* Wed Jul 29 2020 Fedora Release Engineering - 1.0.12-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 1.0.12-19 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.0.12-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 1.0.12-17 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.0.12-16 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.0.12-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 1.0.12-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 22 2019 Miro Hrončok - 1.0.12-13 +- Subpackage python2-rjsmin has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Sat Jul 14 2018 Fedora Release Engineering - 1.0.12-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 1.0.12-11 +- Rebuilt for Python 3.7 + +* Wed Feb 21 2018 Matthias Runge - 1.0.12-10 +- add gcc build requirement + +* Fri Feb 09 2018 Fedora Release Engineering - 1.0.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 30 2018 Iryna Shcherbina - 1.0.12-8 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Thu Aug 03 2017 Fedora Release Engineering - 1.0.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.0.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.0.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.0.12-4 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 1.0.12-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Tue Mar 15 2016 Matthias Runge - 1.0.12-2 +- split out -docs package, clean up description (rhbz#1312350) + +* Fri Feb 26 2016 Matthias Runge - 1.0.12-1 +- Initial package. (rhbz#1312350) diff --git a/python-rjsmin.spec b/python-rjsmin.spec index 028da98..7cb38fd 100644 --- a/python-rjsmin.spec +++ b/python-rjsmin.spec @@ -1,67 +1,39 @@ -# Created by pyp2rpm-2.0.0 %global pypi_name rjsmin +%global desc %{expand: \ +The minifier is based on the semantics of jsmin.c by Douglas Crockford. + +The module is a re-implementation aiming for speed, so it can be used at +runtime (rather than during a preprocessing step). Usually it produces the +same results as the original jsmin.c.} Name: python-%{pypi_name} -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.2.1 +Release: %autorelease Summary: Javascript Minifier -License: ASL 2.0 +License: Apache-2.0 URL: http://opensource.perlig.de/rjsmin/ Source0: https://pypi.python.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -BuildRequires: python3-devel -BuildRequires: python3-setuptools - BuildRequires: gcc +BuildRequires: python3-devel +BuildRequires: python3-pytest +BuildRequires: python3-sphinx +BuildRequires: python3-sphinx_rtd_theme -%description -rJSmin is a javascript minifier written in python. - -The minifier is based on the semantics -of jsmin.c by Douglas Crockford. +%description %{desc} -The module is a re-implementation aiming -for speed, so it can be used at -runtime (rather than during a preprocessing -step). Usually it produces the -same results as the original jsmin.c. - -%package -n python3-%{pypi_name} -Summary: Javascript Minifier -%{?python_provide:%python_provide python3-%{pypi_name}} +%package -n python3-%{pypi_name} +Summary: Javascript Minifier %description -n python3-%{pypi_name} -rJSmin is a javascript minifier written in python. - -The minifier is based on the semantics -of jsmin.c by Douglas Crockford. - -The module is a re-implementation aiming -for speed, so it can be used at -runtime (rather than during a preprocessing -step). Usually it produces the -same results as the original jsmin.c. +%{desc} %package docs -Summary: Javascript Minifier - docs - -BuildRequires: python3-sphinx -BuildRequires: python3-sphinx_rtd_theme +Summary: Javascript Minifier - docs %description docs -Docs for rJSmin, which is a javascript minifier written in python. - -The minifier is based on the semantics -of jsmin.c by Douglas Crockford. - -The module is a re-implementation aiming -for speed, so it can be used at -runtime (rather than during a preprocessing -step). Usually it produces the -same results as the original jsmin.c. - - +%{desc} %prep %autosetup -n %{pypi_name}-%{version} @@ -69,113 +41,30 @@ same results as the original jsmin.c. # strip bang path from rjsmin.py sed -i '1d' rjsmin.py +%generate_buildrequires +%pyproject_buildrequires + %build -%py3_build +%pyproject_wheel -# docs fail to build with -# https://fedoraproject.org/wiki/Changes/Sphinx4 -# sphinx-build -b html docs/_userdoc docs/_userdoc/html -mkdir -p docs/_userdoc/html +sphinx-build -b html docs/_userdoc docs/_userdoc/html +# Remove the sphinx-build leftovers. +rm -rf docs/_userdoc/html/.{doctrees,buildinfo} %install -# Must do the subpackages' install first because the scripts in /usr/bin are -# overwritten with every setup.py install. -%py3_install +%pyproject_install +%pyproject_save_files %{pypi_name} + +%check +%pytest -v -%files -n python3-%{pypi_name} +%files -n python3-%{pypi_name} -f %{pyproject_files} %doc README.md -%license LICENSE -%{python3_sitearch}/%{pypi_name}.py %{python3_sitearch}/_%{pypi_name}.cpython* -%{python3_sitearch}/__pycache__/rjsmin.* -%{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %files docs +%license LICENSE %doc README.md docs/_userdoc/html %changelog -* Fri Jul 22 2022 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jul 06 2022 Armando Neto - 1.2.0-1 -- Update to 1.2.0 - -* Mon Jun 13 2022 Python Maint - 1.1.0-6 -- Rebuilt for Python 3.11 - -* Fri Jan 21 2022 Fedora Release Engineering - 1.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Aug 05 2021 Matthias Runge - 1.1.0-4 -- Fix FTBFS, skip docs build. (rhbz#1977642) - -* Fri Jun 04 2021 Python Maint - 1.1.0-3 -- Rebuilt for Python 3.10 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Sep 08 2020 Yatin Karel - 1.1.0-1 -- Update to 1.1.0 - -* Wed Jul 29 2020 Fedora Release Engineering - 1.0.12-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 1.0.12-19 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.0.12-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 1.0.12-17 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 1.0.12-16 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.0.12-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 1.0.12-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 22 2019 Miro Hrončok - 1.0.12-13 -- Subpackage python2-rjsmin has been removed - See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal - -* Sat Jul 14 2018 Fedora Release Engineering - 1.0.12-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 1.0.12-11 -- Rebuilt for Python 3.7 - -* Wed Feb 21 2018 Matthias Runge - 1.0.12-10 -- add gcc build requirement - -* Fri Feb 09 2018 Fedora Release Engineering - 1.0.12-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 30 2018 Iryna Shcherbina - 1.0.12-8 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Aug 03 2017 Fedora Release Engineering - 1.0.12-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.0.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.0.12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 1.0.12-4 -- Rebuild for Python 3.6 - -* Tue Jul 19 2016 Fedora Release Engineering - 1.0.12-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Tue Mar 15 2016 Matthias Runge - 1.0.12-2 -- split out -docs package, clean up description (rhbz#1312350) - -* Fri Feb 26 2016 Matthias Runge - 1.0.12-1 -- Initial package. (rhbz#1312350) +%autochangelog diff --git a/sources b/sources index faab066..fb4bd28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rjsmin-1.2.0.tar.gz) = 5645a35c75d215ca925f6595d6d1e1833551ec8eabd620b3874ad78bfa7edbacd692a8f6d4ca006aa4b9acee4371dfc4ad5213c9e895a32cbd67b986fe642df3 +SHA512 (rjsmin-1.2.1.tar.gz) = 14920b368c287f53b3d5b5f41c43f8cdcd4d5aff9ec824c33870a62fb0641a1850963a2c5fa0bab777ce094090c507f6dbe11ca3090cc6861c7c6f5d7e30fa96