Updated bins to fall in line with Fedora standards
This commit is contained in:
parent
1eed53e45d
commit
c6c2cd0974
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
Name: python-pygments
|
Name: python-pygments
|
||||||
Version: 2.2.0
|
Version: 2.2.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Syntax highlighting engine written in Python
|
Summary: Syntax highlighting engine written in Python
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -139,7 +139,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
pushd %{py3dir}
|
pushd %{py3dir}
|
||||||
%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
|
%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
|
||||||
popd
|
popd
|
||||||
mv $RPM_BUILD_ROOT/%{_bindir}/pygmentize $RPM_BUILD_ROOT/%{_bindir}/pygmentize3
|
|
||||||
%endif # with_python3
|
%endif # with_python3
|
||||||
|
|
||||||
# Run the Python 2.6 build first so that the Python 2 version of
|
# Run the Python 2.6 build first so that the Python 2 version of
|
||||||
@ -147,7 +146,6 @@ mv $RPM_BUILD_ROOT/%{_bindir}/pygmentize $RPM_BUILD_ROOT/%{_bindir}/pygmentize3
|
|||||||
%if 0%{?with_python26}
|
%if 0%{?with_python26}
|
||||||
pushd %{py26dir}
|
pushd %{py26dir}
|
||||||
%{__python26} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
|
%{__python26} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
|
||||||
cp $RPM_BUILD_ROOT/%{_bindir}/pygmentize $RPM_BUILD_ROOT/%{_bindir}/pygmentize2
|
|
||||||
popd
|
popd
|
||||||
%endif # with_python26
|
%endif # with_python26
|
||||||
|
|
||||||
@ -155,7 +153,6 @@ popd
|
|||||||
%{__python} setup.py build_sphinx
|
%{__python} setup.py build_sphinx
|
||||||
pushd doc
|
pushd doc
|
||||||
install -d %{buildroot}%{_mandir}/man1
|
install -d %{buildroot}%{_mandir}/man1
|
||||||
cp $RPM_BUILD_ROOT/%{_bindir}/pygmentize $RPM_BUILD_ROOT/%{_bindir}/pygmentize2
|
|
||||||
mv pygmentize.1 $RPM_BUILD_ROOT%{_mandir}/man1/pygmentize.1
|
mv pygmentize.1 $RPM_BUILD_ROOT%{_mandir}/man1/pygmentize.1
|
||||||
popd
|
popd
|
||||||
cp -r doc/docs doc/reST
|
cp -r doc/docs doc/reST
|
||||||
@ -189,8 +186,6 @@ popd
|
|||||||
%doc AUTHORS CHANGES build/sphinx/html doc/reST LICENSE TODO
|
%doc AUTHORS CHANGES build/sphinx/html doc/reST LICENSE TODO
|
||||||
# For noarch packages: sitelib
|
# For noarch packages: sitelib
|
||||||
%{python_sitelib}/*
|
%{python_sitelib}/*
|
||||||
%{_bindir}/pygmentize
|
|
||||||
%{_bindir}/pygmentize2
|
|
||||||
%lang(en) %{_mandir}/man1/pygmentize.1.gz
|
%lang(en) %{_mandir}/man1/pygmentize.1.gz
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
@ -198,7 +193,7 @@ popd
|
|||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc AUTHORS CHANGES build/sphinx/html doc/reST LICENSE TODO
|
%doc AUTHORS CHANGES build/sphinx/html doc/reST LICENSE TODO
|
||||||
%{python3_sitelib}/*
|
%{python3_sitelib}/*
|
||||||
%{_bindir}/pygmentize3
|
%{_bindir}/pygmentize
|
||||||
%endif # with_python3
|
%endif # with_python3
|
||||||
|
|
||||||
%if 0%{?with_python26}
|
%if 0%{?with_python26}
|
||||||
@ -207,11 +202,13 @@ popd
|
|||||||
%doc AUTHORS CHANGES doc/ LICENSE TODO
|
%doc AUTHORS CHANGES doc/ LICENSE TODO
|
||||||
%{python26_sitelib}/*
|
%{python26_sitelib}/*
|
||||||
%{_bindir}/pygmentize
|
%{_bindir}/pygmentize
|
||||||
%{_bindir}/pygmentize2
|
|
||||||
%endif # with_python26
|
%endif # with_python26
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 2 2017 Steve Milner <smilner@redhat.com> - 2.2.0-2
|
||||||
|
- Update bin to come back into line with Fedora standards
|
||||||
|
|
||||||
* Thu Mar 2 2017 Steve Milner <smilner@redhat.com> - 2.2.0-1
|
* Thu Mar 2 2017 Steve Milner <smilner@redhat.com> - 2.2.0-1
|
||||||
- Update for upstream release.
|
- Update for upstream release.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user