#
# TODO:
# - goto and see workaround (!)
-# - summary and description (both),
-# ATTENTION! AHTUNG!
+# - real descriptions
+# ATTENTION! ACHTUNG!
# - SNAPSHOT VERSION!
-Summary: Python MSN jabber transport
-Summary(pl.UTF-8): Python MSN jabber transport
+Summary: Python MSN Jabber transport
+Summary(pl.UTF-8): Transport MSN dla Jabbera napisany w Pythonie
Name: PyMSNt
-Version: 0.12
-Release: 0.1
+Version: 0.11.3
+Release: 1
Epoch: 1
-License: GPL
-Group: Libraries/Python
-Source0: http://delx.cjb.net/pymsnt/tarballs/pymsnt-snapshot.tar.gz
-# Source0-md5: 878a3df019c3e56b832feb751a4b4502
+License: GPL v2
+Group: Applications/Communications
+Source0: http://delx.net.au/projects/pymsnt/tarballs/pymsnt-%{version}.tar.gz
+# Source0-md5: e74049fb1bfae59846b1be3d4ef80299
Source1: %{name}-config.xml
Source2: %{name}.init
URL: http://delx.cjb.net/pymsnt/
BuildRequires: python
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
+Requires: python-Imaging
Requires: python-Twisted
Requires: python-Twisted-ssl
-Requires: python-TwistedWords
Requires: python-TwistedWeb
+Requires: python-TwistedWords
Requires: python-TwistedXish
-Requires: python-Imaging
-Requires: python-pyOpenSSL
+Requires: python-pyOpenSSL
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
+Python MSN Jabber transport.
%description -l pl.UTF-8
+Transport MSN dla Jabbera napisany w Pythonie.
%prep
-%setup -q -n pymsnt-snapshot
-
-%build
+%setup -q -n pymsnt-%{version}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{%{_datadir}/pymsnt/src/{twistfix/words/{xish/,protocols/jabber/},legacy/msn/,baseproto/},%{_var}/lib/pymsnt}
-install -d $RPM_BUILD_ROOT/%{_sysconfdir}/{jabber,init.d}
-install -d $RPM_BUILD_ROOT/%{_datadir}/pymsnt/data/
-install src/twistfix/*.py $RPM_BUILD_ROOT/%{_datadir}/pymsnt/src/twistfix/
-install src/twistfix/words/*.py $RPM_BUILD_ROOT/%{_datadir}/pymsnt/src/twistfix/words/
-install src/twistfix/words/xish/*.py $RPM_BUILD_ROOT/%{_datadir}/pymsnt/src/twistfix/words/xish/
-install src/twistfix/words/protocols/*.py $RPM_BUILD_ROOT/%{_datadir}/pymsnt/src/twistfix/words/protocols/
-install src/twistfix/words/protocols/jabber/*.py $RPM_BUILD_ROOT/%{_datadir}/pymsnt/src/twistfix/words/protocols/jabber/
-install src/legacy/*.py $RPM_BUILD_ROOT/%{_datadir}/pymsnt/src/legacy/
-install src/legacy/msn/*.py $RPM_BUILD_ROOT/%{_datadir}/pymsnt/src/legacy/msn/
-install src/baseproto/*.py $RPM_BUILD_ROOT/%{_datadir}/pymsnt/src/baseproto/
-install src/*.py $RPM_BUILD_ROOT/%{_datadir}/pymsnt/src/
-install data/* $RPM_BUILD_ROOT/%{_datadir}/pymsnt/data/
-install PyMSNt.py $RPM_BUILD_ROOT/%{_datadir}/pymsnt/
+install -d $RPM_BUILD_ROOT{%{_datadir}/pymsnt/src/{twistfix/words/{xish,protocols/jabber},legacy/msn,baseproto},%{_var}/lib/pymsnt}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/jabber,/etc/rc.d/init.d}
+install -d $RPM_BUILD_ROOT%{_datadir}/pymsnt/data
+install src/twistfix/*.py $RPM_BUILD_ROOT%{_datadir}/pymsnt/src/twistfix
+install src/twistfix/words/*.py $RPM_BUILD_ROOT%{_datadir}/pymsnt/src/twistfix/words
+install src/twistfix/words/xish/*.py $RPM_BUILD_ROOT%{_datadir}/pymsnt/src/twistfix/words/xish
+install src/twistfix/words/protocols/*.py $RPM_BUILD_ROOT%{_datadir}/pymsnt/src/twistfix/words/protocols
+install src/twistfix/words/protocols/jabber/*.py $RPM_BUILD_ROOT%{_datadir}/pymsnt/src/twistfix/words/protocols/jabber
+install src/legacy/*.py $RPM_BUILD_ROOT%{_datadir}/pymsnt/src/legacy
+install src/legacy/msn/*.py $RPM_BUILD_ROOT%{_datadir}/pymsnt/src/legacy/msn
+install src/baseproto/*.py $RPM_BUILD_ROOT%{_datadir}/pymsnt/src/baseproto
+install src/*.py $RPM_BUILD_ROOT%{_datadir}/pymsnt/src
+install data/* $RPM_BUILD_ROOT%{_datadir}/pymsnt/data
+install PyMSNt.py $RPM_BUILD_ROOT%{_datadir}/pymsnt
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/jabber/PyMSNt.xml
-install %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/PyMSNt
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/jabber/PyMSNt.xml
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/PyMSNt
%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 it here or in twisted words/xish packages)
+#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`
- if [ -n "$SECRET" ] ; then
- echo "Updating component authentication secret in PyMSNt.xml..."
- %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/PyMSNt.xml
- fi
+if [ -f %{_sysconfdir}/jabber/secret ]; then
+ SECRET=`cat %{_sysconfdir}/jabber/secret`
+ if [ -n "$SECRET" ] ; then
+ echo "Updating component authentication secret in PyMSNt.xml..."
+ %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/PyMSNt.xml
+ fi
fi
/sbin/chkconfig --add PyMSNt
%service PyMSNt restart "Jabber MSN transport"
%preun
if [ "$1" = "0" ]; then
- %service PyMSNt stop
- /sbin/chkconfig --del PyMSNt
+ %service PyMSNt stop
+ /sbin/chkconfig --del PyMSNt
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)
%doc README TODO docs
-%dir %{_datadir}/pymsnt/src/twistfix/
+%dir %{_datadir}/pymsnt/src/twistfix
%{_datadir}/pymsnt/src/twistfix/*.py
-%dir %{_datadir}/pymsnt/src/twistfix/words/
+%dir %{_datadir}/pymsnt/src/twistfix/words
%{_datadir}/pymsnt/src/twistfix/words/*.py
-%dir %{_datadir}/pymsnt/src/twistfix/words/xish/
+%dir %{_datadir}/pymsnt/src/twistfix/words/xish
%{_datadir}/pymsnt/src/twistfix/words/xish/*.py
-%dir %{_datadir}/pymsnt/src/twistfix/words/protocols/
+%dir %{_datadir}/pymsnt/src/twistfix/words/protocols
%{_datadir}/pymsnt/src/twistfix/words/protocols/*.py
-%dir %{_datadir}/pymsnt/src/twistfix/words/protocols/jabber/
+%dir %{_datadir}/pymsnt/src/twistfix/words/protocols/jabber
%{_datadir}/pymsnt/src/twistfix/words/protocols/jabber/*.py
-%dir %{_datadir}/pymsnt/src/legacy/
+%dir %{_datadir}/pymsnt/src/legacy
%{_datadir}/pymsnt/src/legacy/*.py
-%dir %{_datadir}/pymsnt/src/legacy/msn/
+%dir %{_datadir}/pymsnt/src/legacy/msn
%{_datadir}/pymsnt/src/legacy/msn/*.py
-%dir %{_datadir}/pymsnt/src/baseproto/
+%dir %{_datadir}/pymsnt/src/baseproto
%{_datadir}/pymsnt/src/baseproto/*.py
%dir %{_datadir}/pymsnt/src
%{_datadir}/pymsnt/src/*.py
-%dir %{_datadir}/pymsnt/data/
+%dir %{_datadir}/pymsnt/data
%{_datadir}/pymsnt/data/*
%dir %{_datadir}/pymsnt
%attr(755,root,root) %{_datadir}/pymsnt/*.py
%dir %{_var}/lib/pymsnt
-%dir %{_sysconfdir}/init.d/
-%attr(755,root,root) %{_sysconfdir}/init.d/PyMSNt
-%dir %{_sysconfdir}/jabber/
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/PyMSNt.xml
+%attr(754,root,root) /etc/rc.d/init.d/PyMSNt
+%attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/PyMSNt.xml