python-kitchen.spec

@@ -3,7 +3,7 @@
 
 Name:           python-kitchen
 Version:        1.2.6
-Release:        8
+Release:        3
 Summary:        Small, useful pieces of code to make python coding easier
 
 License:        LGPLv2+
@@ -14,6 +14,7 @@ BuildArch:      noarch
 
 BuildRequires: python-sphinx
 BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-nose
 BuildRequires:  python%{python3_pkgversion}-test
 BuildRequires:  python%{python3_pkgversion}-chardet
 
@@ -40,11 +41,10 @@ columns a string takes).
 
 This is the python3 version of the kitchen module.
 
-%package    help
+%package -n python%{python3_pkgversion}-kitchen-doc
 Summary:    API documentation for the Kitchen python3 module
 #Requires: python2-kitchen = %{version}-%{release}
-
+%description -n python%{python3_pkgversion}-kitchen-doc
-%description help
 kitchen includes functions to make gettext easier to use, handling unicode
 text easier (conversion with bytes, outputting xml, and calculating how many
 columns a string takes).
@@ -95,7 +95,17 @@ popd
 # # subprocess tests as a check tests /root/bin/PROGRAM and fails with Permission
 # # Denied instead of File Not Found.  reseting the PATH works around this.
 # PATH=/bin:/usr/bin
+# %if 0%{?fedora}
+# PYTHONPATH=.:kitchen2/ nosetests-%{python2_version} kitchen2/tests/
+# %else
+# PYTHONPATH=.:kitchen2/ nosetests kitchen2/tests/
+# %endif
+#
+# %if 0%{?with_python3}
+# pushd %{py3dir}
 # PYTHONPATH=.:kitchen3/ nosetests-%{python3_version} kitchen3/tests/
+# popd
+# %endif
 
 %if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-kitchen
@@ -103,27 +113,12 @@ popd
 %license COPYING COPYING.LESSER
 %{python3_sitelib}/kitchen*
 
-%files help
+%files -n python%{python3_pkgversion}-kitchen-doc
 %doc kitchen3/docs/*
 %license COPYING COPYING.LESSER
 %endif
 
 %changelog
-* Wed Oct 26 2022 zhangruifang <zhangruifang1@h-partners.com> - 1.2.6-8
-- Rebuild for next release
-
-* Tue Mar 15 2022 shixuantong <shixuantong@h-partners.com> - 1.2.6-7
-- rename python3-kitchen-help to python-kitchen-help
-
-* Mon Feb 21 2022 shixuantong <shixuantong@h-partners.com> - 1.2.6-6
-- rename python-kitchen-doc to python-kitchen-help
-
-* Sat Jan 08 2022 shixuantong <shixuantong@huawei.com> - 1.2.6-5
-- remove python3-nose buildrequire
-
-* Wed Dec 09 2020 tianwei <tianwei12@huawei.com> - 1.2.6-4
-- delete sensitive word
-
 * Thu Aug 06 2020 zhangjiapeng <zhangjiapeng9@huawei.com> - 1.2.6-3
 - replace obsolete pngmath with imgmath