!2 update version to 3.25

Merge pull request !2 from t.feng/master

pykickstart-3.25.tar.gz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQFDBAABCgAtFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAl6MxtAPHGJjbEByZWRo
+YXQuY29tAAoJEBF+jBaO/jp/GzUH/Rqfj+Yw7cw99jXUQ05ZVBsTV6YK5I3xMEDi
+KC8X5lE72Wf18aiy+tajDRI648PUJQDjAoJkHJobx3oBQAOlA1ziAJza6GLdyz7f
+j3D16vmGKHOZ4EKQCdnQlth2FcYmcL1PEp5fhl5Lp8HV3GGKQvBcT1eSoB1pxDyD
+Amf2SofXrzLB6+YRXI6uEuRHSYVsN2q9GfOy0Qd/d6W8B4VdgwcbkdsSs5mBX/W1
+ql8v+Vw+tYub1IPQeNvGnAIr6f406AScAK3h1PwCZIE65lg/dlDjMwL2VaS9HzJM
+8bExspKgyAfsCstczbvuqMvSyIJ1xHvqlE3C6SkjUEEEI8B8zzQ=
+=1TsU
+-----END PGP SIGNATURE-----

pykickstart.spec

@@ -1,46 +1,38 @@
 %bcond_with runtests
-%global debug_package %{nil}
 
 Name:      pykickstart
-Version:   3.16
+Version:   3.25
-Release:   2
+Release:   1
-Summary:   Python tools for using kickstart files.
+Summary:   Python utilities for manipulating kickstart files.
 License:   GPLv2 and MIT
 Url:       http://fedoraproject.org/wiki/pykickstart
-Source0:   %{name}-%{version}.tar.gz
+Source0:   https://github.com/pykickstart/pykickstart/releases/download/r3.25/%{name}-%{version}.tar.gz
+Source1:   https://github.com/pykickstart/pykickstart/releases/download/r3.25/%{name}-%{version}.tar.gz.asc
 
-BuildRequires: gettext git
+BuildArch: noarch
-BuildRequires: python2-coverage python2-devel python2-nose python2-ordered-set python2-setuptools python2-requests
+
-BuildRequires: python3-coverage python3-devel python3-nose python3-ordered-set python3-requests python3-setuptools python3-six python3-sphinx
+BuildRequires: gettext python3-coverage python3-devel python3-nose
+BuildRequires: python3-ordered-set python3-requests python3-setuptools
+BuildRequires: python3-six python3-sphinx git
 
 Requires: python3-kickstart = %{version}-%{release}
 
 %description
-%{name} provides python utilities for manipulating kickstart files.
+Python utilities for manipulating kickstart files.
-python-kickstart and python3-kickstart provide libraries and header
-files respectively.
 
-%package	help
+%package    help
-Summary:	Help manual for %{name}
+Summary:    Help manual for %{name}
 
 %description    help
 The %{name}-help package conatins man manual
 
-%package -n python2-kickstart
-%{?python_provide:%python_provide python2-kickstart}
-%{?python_provide:%python_provide python2-pykickstart}
-Summary:  Python 2 library for manipulating kickstart files.
-Requires: python2-six python2-requests python2-ordered-set
-
-%description -n python2-kickstart
-Python 2 library and header files of %{name}
-
 %package -n python3-kickstart
 Summary:  Python 3 library for manipulating kickstart files.
 Requires: python3-six python3-requests python3-ordered-set
 
 %description -n python3-kickstart
-Python 3 library and header files of %{name}
+Python 3 library for manipulating kickstart files.  The binaries are found in
+the pykickstart package.
 
 %package -n python-kickstart-help
 Summary: Help manual for python2-kickstart and python3-kickstart
@@ -50,21 +42,16 @@ The python-kickstart-help package conatins kickstart-docs and programmers-guide
 
 %prep
 %autosetup -n %{name}-%{version} -p1 -Sgit
-rm -rf %{py3dir}
-mkdir %{py3dir}
-cp -a . %{py3dir}
 
 %build
-make PYTHON=%{__python2}
+make PYTHON=%{__python3}
-make -C %{py3dir} PYTHON=%{__python3}
 
 %install
-make PYTHON=%{__python2} DESTDIR=%{buildroot} install
+make PYTHON=%{__python3} DESTDIR=%{buildroot} install
-make -C %{py3dir} PYTHON=%{__python3} DESTDIR=%{buildroot} install
 
 %check
 %if %{with runtests}
-make -C %{py3dir} PYTHON=%{__python3} test
+make PYTHON=%{__python3} test
 %endif
 
 %files
@@ -82,10 +69,6 @@ make -C %{py3dir} PYTHON=%{__python3} test
 %{_mandir}/man1/ksvalidator.1.gz
 %{_mandir}/man1/ksverdiff.1.gz
 
-%files -n python2-kickstart
-%{python2_sitelib}/pykickstart*.egg-info
-%{python2_sitelib}/pykickstart
-
 %files -n python3-kickstart
 %{python3_sitelib}/pykickstart
 %{python3_sitelib}/pykickstart*.egg-info
@@ -96,5 +79,8 @@ make -C %{py3dir} PYTHON=%{__python3} test
 %doc docs/kickstart-docs.txt
 
 %changelog
+* Mon Jun 22 2020 fengtao<fengtao40@huawei.com> - 3.25-1
+- update version to 3.25
+
 * Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.16-2
 - Package init