diff --git a/.gitignore b/.gitignore index 5de0afa..a2589e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /m2r-539a0794236ad25d03bab717c2cc5555d3b098de.tar.gz /m2r-871d57941e74e29bb66ae6d65fa0517e6001f62a.tar.gz /m2r-8e4ce376aa965b243dd73f16e0f8779ac94b6637.tar.gz +/v0.1.10.tar.gz diff --git a/python-m2r.spec b/python-m2r.spec index 15ad244..f016296 100644 --- a/python-m2r.spec +++ b/python-m2r.spec @@ -1,16 +1,14 @@ -%global github_name m2r -%global commit 8e4ce376aa965b243dd73f16e0f8779ac94b6637 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global pkgname m2r %global desc M2R converts a markdown file including reST markups to a valid reST format. -Name: python-%{github_name} -Version: 0.1.7 -Release: 2.git%{shortcommit}%{?dist} +Name: python-%{pkgname} +Version: 0.1.10 +Release: 1 Summary: Markdown to reStructuredText converter License: MIT -URL: https://github.com/miyakogi/%{github_name} -Source0: https://github.com/miyakogi/%{github_name}/archive/%{commit}/%{github_name}-%{commit}.tar.gz +URL: https://github.com/miyakogi/%{pkgname} +Source0: https://github.com/miyakogi/%{pkgname}/archive/v%{version}.tar.gz BuildArch: noarch @@ -19,7 +17,7 @@ BuildArch: noarch %{desc} -%package -n python2-%{github_name} +%package -n python2-%{pkgname} BuildRequires: python2-devel BuildRequires: python-docutils BuildRequires: python-mistune @@ -28,14 +26,14 @@ BuildRequires: python2-mock Requires: python-docutils Requires: python-mistune Summary: %{summary} -%{?python_provide:%python_provide python2-%{github_name}} +%{?python_provide:%python_provide python2-%{pkgname}} -%description -n python2-%{github_name} +%description -n python2-%{pkgname} %{desc} -%package -n python3-%{github_name} +%package -n python3-%{pkgname} BuildRequires: python3-devel BuildRequires: python3-docutils BuildRequires: python3-mistune @@ -44,18 +42,18 @@ BuildRequires: python3-mock Requires: python3-docutils Requires: python3-mistune Summary: %{summary} -%{?python_provide:%python_provide python3-%{github_name}} +%{?python_provide:%python_provide python3-%{pkgname}} -%description -n python3-%{github_name} +%description -n python3-%{pkgname} %{desc} %prep -%setup -qn %{github_name}-%{commit} +%setup -qn %{pkgname}-%{version} # Remove upstream's egg-info -rm -rf %{github_name}.egg-info +rm -rf %{pkgname}.egg-info # Remove shebang sed -i '1{\@^#!/usr/bin/env python@d}' m2r.py @@ -76,25 +74,30 @@ PYTHONPATH=$(pwd) %{__python2} setup.py test -s tests PYTHONPATH=$(pwd) %{__python3} setup.py test -s tests -%files -n python2-%{github_name} +%files -n python2-%{pkgname} %license LICENSE %doc README.md -%{python2_sitelib}/%{github_name}.py{,c,o} -%{python2_sitelib}/%{github_name}-%{version}*-py%{python2_version}.egg-info +%{python2_sitelib}/%{pkgname}.py{,c,o} +%{python2_sitelib}/%{pkgname}-%{version}*-py%{python2_version}.egg-info %exclude %{python2_sitelib}/tests -%files -n python3-%{github_name} +%files -n python3-%{pkgname} %license LICENSE %doc README.md %{_bindir}/m2r %{python3_sitelib}/__pycache__/* -%{python3_sitelib}/%{github_name}.py -%{python3_sitelib}/%{github_name}-%{version}*-py%{python3_version}.egg-info +%{python3_sitelib}/%{pkgname}.py +%{python3_sitelib}/%{pkgname}-%{version}*-py%{python3_version}.egg-info %exclude %{python3_sitelib}/tests %changelog +* Tue Aug 15 2017 Nikola Forró - 0.1.10-1 +- Update to 0.1.10 +- Switch to release versioning + resolves: #1480575 + * Thu Jul 27 2017 Fedora Release Engineering - 0.1.7-2.git8e4ce37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 82e8931..22ae41f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m2r-8e4ce376aa965b243dd73f16e0f8779ac94b6637.tar.gz) = 4f5d6302e0a2ad678854a1c13529f3d7cb10efe1f612d984d90bc26f7220deed61b7e08fc735d6d3d96d887f4573b2f61cb523a3635a58d958fade841f11aecf +SHA512 (v0.1.10.tar.gz) = fb2cce8fb4ecf09161cf256ad2bda0f12274bee013c39a0ddea2c58b882a887b69f13bfdae3528dd0d1525f28658d17f62f2856b7cbaa17542eeaa1187a744d9