[python-ladon/f17] - really remove reference to (un-)bundled lib

[Matthias Runge]

commit 4e5b469146fecd6a41f6de6c53f3324f94d64ce8
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Mon Mar 12 10:49:31 2012 +0100

    - really remove reference to (un-)bundled lib

 python-ladon.spec |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/python-ladon.spec b/python-ladon.spec
index 4220fdf..b4dc71e 100644
--- a/python-ladon.spec
+++ b/python-ladon.spec
@@ -1,11 +1,12 @@
 Name:           python-ladon
 Version:        0.7.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiprotocol approach to creating a webservice
 
 License:        LGPLv3+
 URL:            http://ladonize.org
 Source0:        http://pypi.python.org/packages/source/l/ladon/ladon-%{version}.tar.gz
+# #md5=07dd1d395d0d7123448d7710bb3da32a
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -23,6 +24,18 @@ Ladon's protocol support.
 %prep
 %setup -q -n ladon-%{version}
 
+# remove egg-info:
+rm -rf src/ladon.egg-info
+
+# remove bundled chardet lib
+rm -rf src/chardet_py2
+
+# correct references to chardet
+for i in `find src/ladon -name '*.py'`; do
+    sed -i -e 's/chardet_py2/chardet/' $i
+done
+
+
 
 %build
 %{__python} setup.py build
@@ -33,17 +46,19 @@ Ladon's protocol support.
 chmod 755 %{buildroot}/%{python_sitelib}/ladon/clients/jsonwsp.py
 rm %{buildroot}/%{_bindir}/ladon2.?ctl.py
 
-# remove bundled library
-rm -rf %{buildroot}/%{python_sitelib}/chardet_py2
  
 %files
 %doc PKG-INFO
-%{python_sitelib}/*
-%{_bindir}/ladon2.?ctl
+%{python_sitelib}/ladon
+%{python_sitelib}/ladon-%{version}-py?.?.egg-info
+%{_bindir}/ladon?.?ctl
 
 %changelog
-* Fri Feb 10 2012 Matthias Runge <mrunge at matthias-runge.de> - 0.7.0-1
+
+* Mon Mar 12 2012 Matthias Runge <mrunge at matthias-runge.de> - 0.7.0-2
 - update to version 0.7.0
+- spec cleanup
+- make sure, removed bundled lib isn't referenced anymore
 
 * Thu Feb 02 2012 Matthias Runge <mrunge at matthias-runge.de> - 0.6.7-1
 - update to Version 0.6.7