- adapter, cosmetics

Changed files:
    PyMSNt.spec -> 1.13

diff --git a/PyMSNt.spec b/PyMSNt.spec
index 52281ee067f99746be77ddbd690bcbcaf42c8145..9b45b82396000afbdaeae2d57fba904a79fb8575 100644 (file)
--- a/PyMSNt.spec
+++ b/PyMSNt.spec
@@ -21,40 +21,38 @@ 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
 
-%description -l pl.UTF-8
-
 %prep
 %setup -q -n pymsnt-snapshot
 
 %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
@@ -62,25 +60,25 @@ install %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/PyMSNt
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#ugly workaround (maybe fix in twisted words/xish package?)
+# 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
+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
@@ -114,5 +112,5 @@ rm -f %{py_sitedir}/twisted/xish
 %dir %{_datadir}/pymsnt
 %attr(755,root,root) %{_datadir}/pymsnt/*.py
 %dir %{_var}/lib/pymsnt
-%attr(755,root,root) %{_sysconfdir}/init.d/PyMSNt
+%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