From 11d82bee78c315053a0e5ca0713d49f12146f4a713eeb72e022dd15a9c30a5b7 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Fri, 16 Mar 2012 14:35:11 +0000
Subject: [PATCH] - Remove service - Spec file cleanup:   * Remove outdated
 sections   * Proper macro usage

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ldap?expand=0&rev=17
---
 _service                                      |  3 --
 ...p-2.4.9.tar.gz => python-ldap-2.4.9.tar.gz |  0
 python-ldap.changes                           |  8 ++++
 python-ldap.spec                              | 38 +++++++++----------
 4 files changed, 27 insertions(+), 22 deletions(-)
 delete mode 100644 _service
 rename _service:download_files:python-ldap-2.4.9.tar.gz => python-ldap-2.4.9.tar.gz (100%)

diff --git a/_service b/_service
deleted file mode 100644
index 76828d7..0000000
--- a/_service
+++ /dev/null
@@ -1,3 +0,0 @@
-<services>
-  <service name="download_files"/>
-</services>
\ No newline at end of file
diff --git a/_service:download_files:python-ldap-2.4.9.tar.gz b/python-ldap-2.4.9.tar.gz
similarity index 100%
rename from _service:download_files:python-ldap-2.4.9.tar.gz
rename to python-ldap-2.4.9.tar.gz
diff --git a/python-ldap.changes b/python-ldap.changes
index e5e324e..1129435 100644
--- a/python-ldap.changes
+++ b/python-ldap.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar 16 14:34:59 UTC 2012 - saschpe@suse.de
+
+- Remove service
+- Spec file cleanup:
+  * Remove outdated sections
+  * Proper macro usage
+
 -------------------------------------------------------------------
 Tue Oct 11 12:45:02 UTC 2011 - jmatejek@suse.com
 
diff --git a/python-ldap.spec b/python-ldap.spec
index 37ed59f..820f724 100644
--- a/python-ldap.spec
+++ b/python-ldap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-ldap
 #
-# 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
@@ -15,22 +15,25 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           python-ldap
-BuildRequires:  fdupes krb5-devel cyrus-sasl-devel openldap2-devel >= 2.4.11 python-devel
-Requires:       libldap-2_4-2 >= 2.4.11
+Version:        2.4.9
+Release:        0
+Summary:        Python LDAP interface
 License:        SUSE-Public-Domain
 Group:          Development/Libraries/Python
-AutoReqProv:    on
-Version:        2.4.9
-Release:        1
-Summary:        Python LDAP interface
 Url:            http://www.python-ldap.org/
 Source:         http://pypi.python.org/packages/source/p/python-ldap/python-ldap-%{version}.tar.gz
+BuildRequires:  cyrus-sasl-devel
+BuildRequires:  fdupes
+BuildRequires:  krb5-devel
+BuildRequires:  openldap2-devel >= 2.4.11
+BuildRequires:  python-devel
+Requires:       libldap-2_4-2 >= 2.4.11
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{py_requires}
+%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
 
 %description
 python-ldap provides an LDAP client API for Python in the spirit of
@@ -39,23 +42,20 @@ LDAP C library, an object-oriented API for X.500 directories. See
 python-ldap pages on http://python-ldap.sourceforge.net/
 
 %prep
-%setup
+%setup -q
 cp Build/setup.cfg.suse-linux setup.cfg
 find -name ".CVS" -o -name ".cvsignore" -exec rm -rf {} ";"
 
 %build
-#export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
-python setup.py build
+CFLAGS="%{optflags} -DLDAP_DEPRECATED" python setup.py build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES
-%fdupes $RPM_BUILD_ROOT/%{_libdir}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%fdupes %{buildroot}/%{_libdir}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f INSTALLED_FILES
+%files
 %defattr(-,root,root)
 %doc README Demo CHANGES TODO LICENCE
+%{python_sitearch}/*
 
 %changelog