- updated to 0.8.1.5

Changed files:
    PyICQt.spec -> 1.9

diff --git a/PyICQt.spec b/PyICQt.spec
index d1a0fbbd44b3f50829fb4a0b04fe2650cc174425..c9c35b06c915ece4b8050b2ac92d4e13b368d2ab 100644 (file)
--- a/PyICQt.spec
+++ b/PyICQt.spec
@@ -1,19 +1,12 @@
-#
-# TODO:
-# - i suppose that workaround for python Twisted is also needed - goto workaround and think about it
-# - description (both),
-
-%bcond_with ugly  # enable ugly workaround for python Twisted (see above)
-
 Summary:       Python ICQ Jabber transport
 Summary(pl.UTF-8):     Transport ICQ dla Jabbera napisany w Pythonie
 Name:          PyICQt
-Version:       0.8b
-Release:       0.2
+Version:       0.8.1.5
+Release:       1
 License:       GPL v2
 Group:         Applications/Communications
-Source0:       http://pyicqt.googlecode.com/files/pyicq-t-%{version}.tar.gz
-# Source0-md5: 961952be1f88d0b97bc7cc36c75d1215
+Source0:       http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
+# Source0-md5: d1c544f82ed416bbe987a5e419820fa8
 Source1:       %{name}-config.xml
 Source2:       %{name}.init
 URL:           http://www.blathersource.org/
@@ -36,25 +29,21 @@ Python ICQ Jabber transport.
 Transport ICQ dla Jabbera napisany w Pythonie.
 
 %prep
-%setup -q -n pyicq-t-%{version}
+%setup -q -n pyicqt-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/pyicqt/src/{twistfix/words/{xish,protocols/jabber},legacy/services,langs,tlib,services,xdb,web},%{_var}/lib/pyicqt}
+install -d $RPM_BUILD_ROOT{%{_datadir}/pyicqt/src/{chardet_utf,langs,legacy/services,services,tlib,web,xdb},%{_var}/lib/pyicqt}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/jabber,/etc/rc.d/init.d}
 install -d $RPM_BUILD_ROOT%{_datadir}/pyicqt/data/www/{css,images}
-install src/twistfix/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/twistfix
-install src/twistfix/words/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/twistfix/words
-install src/twistfix/words/xish/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/twistfix/words/xish
-install src/twistfix/words/protocols/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/twistfix/words/protocols
-install src/twistfix/words/protocols/jabber/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/twistfix/words/protocols/jabber
+install src/chardet_utf/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/chardet_utf
+install src/langs/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/langs
 install src/legacy/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/legacy
 install src/legacy/services/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/legacy/services
-install src/langs/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/langs
-install src/tlib/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/tlib
 install src/services/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/services
-install src/xdb/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/xdb
+install src/tlib/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/tlib
 install src/web/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/web
+install src/xdb/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/xdb
 install src/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src
 install data/www/css/*.css $RPM_BUILD_ROOT%{_datadir}/pyicqt/data/www/css
 install data/www/images/*.png $RPM_BUILD_ROOT%{_datadir}/pyicqt/data/www/images
@@ -69,13 +58,6 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/PyICQt
 rm -rf $RPM_BUILD_ROOT
 
 %post
-
-%if %{with ugly}
-#ugly workaround (FIX this or twisted words/xish package to work without hacks)
-ln -s %{py_sitescriptdir}/twisted/words/ %{py_sitedir}/twisted/words
-ln -s %{py_sitescriptdir}/twisted/xish/ %{py_sitedir}/twisted/xish
-%endif
-
 if [ -f %{_sysconfdir}/jabber/secret ] ; then
        SECRET=`cat %{_sysconfdir}/jabber/secret`
        if [ -n "$SECRET" ] ; then
@@ -92,40 +74,25 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del PyICQt
 fi
 
-%postun
-%if %{with ugly}
-echo "Cleaning ugly workaround (%{py_sitedir}/twisted/{words,xish})"
-rm -f %{py_sitedir}/twisted/words
-rm -f %{py_sitedir}/twisted/xish
-%endif
-
 %files
 %defattr(644,root,root,755)
 %doc README NEWS AUTHORS ChangeLog
-%dir %{_datadir}/pyicqt/src/twistfix
-%{_datadir}/pyicqt/src/twistfix/*.py
-%dir %{_datadir}/pyicqt/src/twistfix/words
-%{_datadir}/pyicqt/src/twistfix/words/*.py
-%dir %{_datadir}/pyicqt/src/twistfix/words/xish
-%{_datadir}/pyicqt/src/twistfix/words/xish/*.py
-%dir %{_datadir}/pyicqt/src/twistfix/words/protocols
-%{_datadir}/pyicqt/src/twistfix/words/protocols/*.py
-%dir %{_datadir}/pyicqt/src/twistfix/words/protocols/jabber
-%{_datadir}/pyicqt/src/twistfix/words/protocols/jabber/*.py
+%dir %{_datadir}/pyicqt/src/chardet_utf
+%{_datadir}/pyicqt/src/chardet_utf/*.py
+%dir %{_datadir}/pyicqt/src/langs
+%{_datadir}/pyicqt/src/langs/*.py
 %dir %{_datadir}/pyicqt/src/legacy
 %{_datadir}/pyicqt/src/legacy/*.py
 %dir %{_datadir}/pyicqt/src/legacy/services
 %{_datadir}/pyicqt/src/legacy/services/*.py
-%dir %{_datadir}/pyicqt/src/langs
-%{_datadir}/pyicqt/src/langs/*.py
-%dir %{_datadir}/pyicqt/src/tlib
-%{_datadir}/pyicqt/src/tlib/*.py
 %dir %{_datadir}/pyicqt/src/services
 %{_datadir}/pyicqt/src/services/*.py
-%dir %{_datadir}/pyicqt/src/xdb
-%{_datadir}/pyicqt/src/xdb/*.py
+%dir %{_datadir}/pyicqt/src/tlib
+%{_datadir}/pyicqt/src/tlib/*.py
 %dir %{_datadir}/pyicqt/src/web
 %{_datadir}/pyicqt/src/web/*.py
+%dir %{_datadir}/pyicqt/src/xdb
+%{_datadir}/pyicqt/src/xdb/*.py
 %dir %{_datadir}/pyicqt/src
 %{_datadir}/pyicqt/src/*.py
 %dir %{_datadir}/pyicqt/data/www/images