SPECS: PyICQt.spec - cleanup, disabled broken workaround (wrong pl...

[qboosh]

Author: qboosh                       Date: Sat Aug 25 09:08:28 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup, disabled broken workaround (wrong place, wrong way)

---- Files affected:
SPECS:
   PyICQt.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/PyICQt.spec
diff -u SPECS/PyICQt.spec:1.5 SPECS/PyICQt.spec:1.6
--- SPECS/PyICQt.spec:1.5	Sun Aug 19 14:49:53 2007
+++ SPECS/PyICQt.spec	Sat Aug 25 11:08:23 2007
@@ -4,12 +4,12 @@
 # - i suppose that workaround for python Twisted is also needed - goto workaround and think about it
 # - description (both),
 
-Summary:	Python ICQ jabber transport
-Summary(pl.UTF-8):	Transport ICQ dla jabbera napisany w pythonie
+Summary:	Python ICQ Jabber transport
+Summary(pl.UTF-8):	Transport ICQ dla Jabbera napisany w Pythonie
 Name:		PyICQt
 Version:	0.8a
 Release:	0.1
-License:	GPL
+License:	GPL v2
 Group:		Applications/Communications
 Source0:	http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}.tar.gz
 # Source0-md5:	eb44605d5f952759e3cba19815d367d2
@@ -31,15 +31,17 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
+Python ICQ Jabber transport.
 
 %description -l pl.UTF-8
+Transport ICQ dla Jabbera napisany w Pythonie.
 
 %prep
 %setup -q -n pyicq-t-%{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/{twistfix/words/{xish,protocols/jabber},legacy/services,langs,tlib,services,xdb,web},%{_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 -d $RPM_BUILD_ROOT%{_sbindir}
@@ -69,10 +71,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#ugly workaround (maybe fix in twisted words/xish package?)
 %post
-ln -s %{py_sitescriptdir}/twisted/words/ %{py_sitedir}/twisted/words
-ln -s %{py_sitescriptdir}/twisted/xish/ %{py_sitedir}/twisted/xish
+#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
 
 if [ -f %{_sysconfdir}/jabber/secret ] ; then
 	SECRET=`cat %{_sysconfdir}/jabber/secret`
@@ -90,10 +92,10 @@
 	/sbin/chkconfig --del PyICQt
 fi
 
-%postun
-echo "Cleaing ugly workaround (%{py_sitedir}/twisted/{words,xish})"
-rm -f %{py_sitedir}/twisted/words
-rm -f %{py_sitedir}/twisted/xish
+#%postun
+#echo "Cleaing ugly workaround (%{py_sitedir}/twisted/{words,xish})"
+#rm -f %{py_sitedir}/twisted/words
+#rm -f %{py_sitedir}/twisted/xish
 
 %files
 %defattr(644,root,root,755)
@@ -145,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007/08/25 09:08:23  qboosh
+- cleanup, disabled broken workaround (wrong place, wrong way)
+
 Revision 1.5  2007/08/19 12:49:53  glen
 - path fixes
 
@@ -163,5 +168,3 @@
 Revision 1.1  2007/08/18 22:48:37  djrzulf
 - based on PyMSNt, rewrite definition of folders, NFY, need to create
   init and config.xml, saved becouse Zona Krzyczy! ;-),
-
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/PyICQt.spec?r1=1.5&r2=1.6&f=u