[python-ladon] update to 0.7.0, really remove referenc to bundled lib

Matthias Runge mrunge at fedoraproject.org
Mon Mar 12 09:39:36 UTC 2012


commit 67b6b38c56c4fcf5a287fc785d3e82556dae6a29
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Mon Mar 12 10:38:48 2012 +0100

    update to 0.7.0, really remove referenc to bundled lib

 .gitignore        |    1 +
 python-ladon.spec |   26 +++++++++++++++++++++-----
 sources           |    2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b942624..c2ff2e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /ladon-0.6.5.tar.gz
 /ladon-0.6.7.tar.gz
+/ladon-0.7.0.tar.gz
diff --git a/python-ladon.spec b/python-ladon.spec
index e107641..620931e 100644
--- a/python-ladon.spec
+++ b/python-ladon.spec
@@ -1,5 +1,5 @@
 Name:           python-ladon
-Version:        0.6.7
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        Multiprotocol approach to creating a webservice
 
@@ -24,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
@@ -34,15 +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
+* Mon Mar 12 2012 Matthias Runge <mrunge at matthias-runge.de> - 0.7.0-1
+- 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
 
diff --git a/sources b/sources
index 61a8318..073f73f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b55e484aa73f9edba9e1252af039df42  ladon-0.6.7.tar.gz
+62695df586c2d87fbd7675c34491b2e1  ladon-0.7.0.tar.gz


More information about the scm-commits mailing list