Author: prism Date: Mon Feb 11 20:39:34 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - 0.8b - ugly workaround can be enabled with 'ugly' bcond (works for me)
---- Files affected: SPECS: PyICQt.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/PyICQt.spec diff -u SPECS/PyICQt.spec:1.6 SPECS/PyICQt.spec:1.7 --- SPECS/PyICQt.spec:1.6 Sat Aug 25 11:08:23 2007 +++ SPECS/PyICQt.spec Mon Feb 11 21:39:28 2008 @@ -4,18 +4,19 @@ # - 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.8a +Version: 0.8b Release: 0.1 License: GPL v2 Group: Applications/Communications -Source0: http://www.blathersource.org/download.php/pyicq-t/pyicq-t-%{version}.tar.gz -# Source0-md5: eb44605d5f952759e3cba19815d367d2 +Source0: http://pyicqt.googlecode.com/files/pyicq-t-%{version}.tar.gz +# Source0-md5: 961952be1f88d0b97bc7cc36c75d1215 Source1: %{name}-config.xml Source2: %{name}.init -Source3: pyicqt.sh URL: http://www.blathersource.org/ BuildRequires: python BuildRequires: rpm-pythonprov @@ -44,7 +45,6 @@ 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} 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 @@ -66,15 +66,17 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/jabber/PyICQt.xml install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/PyICQt -install %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir} %clean 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 +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` @@ -92,10 +94,12 @@ /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 +%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) @@ -139,7 +143,6 @@ %dir %{_var}/lib/pyicqt %attr(754,root,root) /etc/rc.d/init.d/PyICQt %attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/PyICQt.xml -%attr(755,root,root) %{_sbindir}/*.sh %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -147,7 +150,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.6 2007-08-25 09:08:23 qboosh +Revision 1.7 2008-02-11 20:39:28 prism +- 0.8b +- ugly workaround can be enabled with 'ugly' bcond (works for me) + +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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/PyICQt.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
