SPECS: PyICQt.spec - path fixes
glen
glen at pld-linux.org
Sun Aug 19 14:49:59 CEST 2007
Author: glen Date: Sun Aug 19 12:49:59 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- path fixes
---- Files affected:
SPECS:
PyICQt.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SPECS/PyICQt.spec
diff -u SPECS/PyICQt.spec:1.4 SPECS/PyICQt.spec:1.5
--- SPECS/PyICQt.spec:1.4 Sun Aug 19 13:43:38 2007
+++ SPECS/PyICQt.spec Sun Aug 19 14:49:53 2007
@@ -20,13 +20,13 @@
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)
@@ -39,32 +39,32 @@
%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/%{_sysconfdir}/{jabber,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/
-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/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/web/*.py $RPM_BUILD_ROOT/%{_datadir}/pyicqt/src/web/
-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/
-install data/www/*.html $RPM_BUILD_ROOT/%{_datadir}/pyicqt/data/www/
-install data/*.png $RPM_BUILD_ROOT/%{_datadir}/pyicqt/data/
-install PyICQt.py $RPM_BUILD_ROOT/%{_datadir}/pyicqt/
-
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/jabber/PyICQt.xml
-install %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/PyICQt
-install %{SOURCE3} $RPM_BUILD_ROOT/%{_sbindir}/
+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
+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/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/web/*.py $RPM_BUILD_ROOT%{_datadir}/pyicqt/src/web
+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
+install data/www/*.html $RPM_BUILD_ROOT%{_datadir}/pyicqt/data/www
+install data/*.png $RPM_BUILD_ROOT%{_datadir}/pyicqt/data
+install PyICQt.py $RPM_BUILD_ROOT%{_datadir}/pyicqt
+
+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
@@ -75,19 +75,19 @@
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 PyICQt.xml..."
- %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/PyICQt.xml
- fi
+ SECRET=`cat %{_sysconfdir}/jabber/secret`
+ if [ -n "$SECRET" ] ; then
+ echo "Updating component authentication secret in PyICQt.xml..."
+ %{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/PyICQt.xml
+ fi
fi
/sbin/chkconfig --add PyICQt
%service PyICQt restart "Jabber ICQ transport"
%preun
if [ "$1" = "0" ]; then
- %service PyICQt stop
- /sbin/chkconfig --del PyICQt
+ %service PyICQt stop
+ /sbin/chkconfig --del PyICQt
fi
%postun
@@ -98,44 +98,44 @@
%files
%defattr(644,root,root,755)
%doc README NEWS AUTHORS ChangeLog
-%dir %{_datadir}/pyicqt/src/twistfix/
+%dir %{_datadir}/pyicqt/src/twistfix
%{_datadir}/pyicqt/src/twistfix/*.py
-%dir %{_datadir}/pyicqt/src/twistfix/words/
+%dir %{_datadir}/pyicqt/src/twistfix/words
%{_datadir}/pyicqt/src/twistfix/words/*.py
-%dir %{_datadir}/pyicqt/src/twistfix/words/xish/
+%dir %{_datadir}/pyicqt/src/twistfix/words/xish
%{_datadir}/pyicqt/src/twistfix/words/xish/*.py
-%dir %{_datadir}/pyicqt/src/twistfix/words/protocols/
+%dir %{_datadir}/pyicqt/src/twistfix/words/protocols
%{_datadir}/pyicqt/src/twistfix/words/protocols/*.py
-%dir %{_datadir}/pyicqt/src/twistfix/words/protocols/jabber/
+%dir %{_datadir}/pyicqt/src/twistfix/words/protocols/jabber
%{_datadir}/pyicqt/src/twistfix/words/protocols/jabber/*.py
-%dir %{_datadir}/pyicqt/src/legacy/
+%dir %{_datadir}/pyicqt/src/legacy
%{_datadir}/pyicqt/src/legacy/*.py
-%dir %{_datadir}/pyicqt/src/legacy/services/
+%dir %{_datadir}/pyicqt/src/legacy/services
%{_datadir}/pyicqt/src/legacy/services/*.py
-%dir %{_datadir}/pyicqt/src/langs/
+%dir %{_datadir}/pyicqt/src/langs
%{_datadir}/pyicqt/src/langs/*.py
-%dir %{_datadir}/pyicqt/src/tlib/
+%dir %{_datadir}/pyicqt/src/tlib
%{_datadir}/pyicqt/src/tlib/*.py
-%dir %{_datadir}/pyicqt/src/services/
+%dir %{_datadir}/pyicqt/src/services
%{_datadir}/pyicqt/src/services/*.py
-%dir %{_datadir}/pyicqt/src/xdb/
+%dir %{_datadir}/pyicqt/src/xdb
%{_datadir}/pyicqt/src/xdb/*.py
-%dir %{_datadir}/pyicqt/src/web/
+%dir %{_datadir}/pyicqt/src/web
%{_datadir}/pyicqt/src/web/*.py
%dir %{_datadir}/pyicqt/src
%{_datadir}/pyicqt/src/*.py
-%dir %{_datadir}/pyicqt/data/www/images/
+%dir %{_datadir}/pyicqt/data/www/images
%{_datadir}/pyicqt/data/www/images/*.png
-%dir %{_datadir}/pyicqt/data/www/css/
+%dir %{_datadir}/pyicqt/data/www/css
%{_datadir}/pyicqt/data/www/css/*.css
-%dir %{_datadir}/pyicqt/data/www/
+%dir %{_datadir}/pyicqt/data/www
%{_datadir}/pyicqt/data/www/*.html
-%dir %{_datadir}/pyicqt/data/
+%dir %{_datadir}/pyicqt/data
%{_datadir}/pyicqt/data/*.png
%dir %{_datadir}/pyicqt
%attr(755,root,root) %{_datadir}/pyicqt/*.py
%dir %{_var}/lib/pyicqt
-%attr(755,root,root) %{_sysconfdir}/init.d/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
@@ -145,6 +145,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2007/08/19 12:49:53 glen
+- path fixes
+
Revision 1.4 2007/08/19 11:43:38 djrzulf
- some cleanups,
- added .sh file (source3),
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/PyICQt.spec?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list