From 1dbb967f35c4c434567243d1450c3ffe86f26008b717f1f0883741fb44975778 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 11 Jun 2012 07:44:47 +0000 Subject: [PATCH 1/2] Accepting request 124312 from home:openttdcoop build for CentOS OBS-URL: https://build.opensuse.org/request/show/124312 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ply?expand=0&rev=15 --- python-ply.spec | 3 ++- python3-ply.spec | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/python-ply.spec b/python-ply.spec index 4fd55fb..f327fb3 100644 --- a/python-ply.spec +++ b/python-ply.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define modname ply Name: python-%{modname} Version: 3.4 @@ -27,7 +28,7 @@ Source: http://www.dabeaz.com/%{modname}/%{modname}-%{version}.tar.gz Patch0: python-ply-shebangs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel -%if 0%{?suse_version} <= 1110 +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 %py_requires %endif %if 0%{?suse_version} > 1110 || 0%{?fedora} > 12 || 0%{?mdkversion} diff --git a/python3-ply.spec b/python3-ply.spec index 9ea5016..7cd4df0 100644 --- a/python3-ply.spec +++ b/python3-ply.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define modname ply Name: python3-%{modname} Version: 3.4 From 8696d935a8a3b4b07f4b27221ab335ff0a65798e8659a7630899eb88eb3dc502 Mon Sep 17 00:00:00 2001 From: Todd R Date: Sun, 25 Nov 2012 11:10:45 +0000 Subject: [PATCH 2/2] Accepting request 142767 from devel:languages:python3 Removed openSUSE 11.4 spec file workarounds (forwarded request 142748 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/142767 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ply?expand=0&rev=16 --- python3-ply.changes | 5 +++++ python3-ply.spec | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/python3-ply.changes b/python3-ply.changes index 9852fdd..b8fa733 100644 --- a/python3-ply.changes +++ b/python3-ply.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 22 13:47:34 UTC 2012 - toddrme2178@gmail.com + +- Removed openSUSE 11.4 spec file workarounds + ------------------------------------------------------------------- Fri May 25 10:04:47 UTC 2012 - toddrme2178@gmail.com diff --git a/python3-ply.spec b/python3-ply.spec index 7cd4df0..fe89a8e 100644 --- a/python3-ply.spec +++ b/python3-ply.spec @@ -29,12 +29,6 @@ Patch0: python-ply-shebangs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3-2to3 BuildRequires: python3-devel -%if 0%{?suse_version} <= 1140 -%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)} -%else -BuildRequires: python3-base -%endif Requires: python(abi) = %{py3_ver} BuildArch: noarch @@ -86,10 +80,6 @@ rm -rf %{buildroot} %doc ANNOUNCE CHANGES README TODO %{python3_sitelib}/%{modname}/ %{python3_sitelib}/%{modname}-%{version}-py%{py3_ver}.egg-info -%if 0%{?suse_version} <= 1140 -%dir %{_prefix}/lib/python%{py3_ver} -%dir %{python3_sitelib} -%endif %files doc %defattr(-,root,root,-)