diff --git a/python-psycopg2.changes b/python-psycopg2.changes index 1e0c889..a069285 100644 --- a/python-psycopg2.changes +++ b/python-psycopg2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 12 21:10:27 UTC 2012 - saschpe@gmx.de + +- Simplify macro usage +- Remove outdated SUSE version checks + ------------------------------------------------------------------- Mon Feb 13 10:54:08 UTC 2012 - coolo@suse.com diff --git a/python-psycopg2.spec b/python-psycopg2.spec index 8e9fb54..7852423 100644 --- a/python-psycopg2.spec +++ b/python-psycopg2.spec @@ -1,7 +1,7 @@ # # spec file for package python-psycopg2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,17 +23,14 @@ Url: http://initd.org/psycopg/ Summary: Python-PostgreSQL Database Adapter License: LGPL-3.0+ or ZPL-2.0 Group: Development/Languages/Python -Source: psycopg2-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/p/psycopg2/psycopg2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: postgresql-devel -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1010 BuildRequires: fdupes +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %endif -%endif -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %description psycopg2 is a PostgreSQL database adapter for the Python programming @@ -64,10 +61,8 @@ rm -rf doc/src doc/html/.buildinfo # Remove junk %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} rm -rf %{buildroot}%{python_sitearch}/psycopg2/tests # Don't package testsuite -%if 0%{?suse_version} > 1010 %fdupes -s %{buildroot}/%_mandir # Create symlinks for man pages %fdupes %{buildroot} # Create hardlinks for the rest -%endif %files %defattr(-,root,root,-)