[python-ladon/f16] make sure, removed bundled lib isn't referenced anymore

Matthias Runge mrunge at fedoraproject.org
Mon Mar 12 09:59:47 UTC 2012


commit 94dbfb1b6eeefa2ffe1feabe81f77e7b9254566f
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Mon Mar 12 10:59:29 2012 +0100

    make sure, removed bundled lib isn't referenced anymore

 python-ladon.spec |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/python-ladon.spec b/python-ladon.spec
index e107641..62223e4 100644
--- a/python-ladon.spec
+++ b/python-ladon.spec
@@ -1,6 +1,6 @@
 Name:           python-ladon
 Version:        0.6.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiprotocol approach to creating a webservice
 
 License:        LGPLv3+
@@ -28,21 +28,35 @@ Ladon's protocol support.
 %build
 %{__python} setup.py build
 
+# 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
+
+
 
 %install
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 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
+* Mon Mar 12 2012 Matthias Runge <mrunge at matthias-runge.de> - 0.6.7-2
+- 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
 


More information about the scm-commits mailing list