- works

Changed files:
    ConferenceRoom.spec -> 1.6

diff --git a/ConferenceRoom.spec b/ConferenceRoom.spec
index de20f5a208350a2cdf44990c2e55d839ad16ec20..ce1d4220160ddc2ddfa5004c25fc3311eceda540 100644 (file)
--- a/ConferenceRoom.spec
+++ b/ConferenceRoom.spec
@@ -2,7 +2,7 @@ Summary:        ConferenceRoom IRC Server
 Summary(pl.UTF-8):     ConferenceRoom - serwer IRC
 Name:          ConferenceRoom
 Version:       1.8.9.1
-Release:       0.10
+Release:       0.11
 License:       not distributable
 Group:         Applications/Communications
 Source0:       CR%{version}-Linux.tar.gz
@@ -21,8 +21,6 @@ Provides:     user(ircd)
 ExclusiveArch: %{ix86}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/cr
-
 # already stripped
 %define                no_install_post_strip           1
 %define                no_install_post_chrpath         1
@@ -39,20 +37,30 @@ ConferenceRoom to serwer IRC-a.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_datadir}/cr,%{_sysconfdir},%{_libdir}/cr/programs,/var/{lib,log}/cr}
+install -d $RPM_BUILD_ROOT{%{_datadir}/cr,%{_libdir}/cr/programs,/var/lib/cr/db,/var/log/cr}
 cp -a programs/* $RPM_BUILD_ROOT%{_libdir}/cr/programs
 cp -a htdocs template variables $RPM_BUILD_ROOT%{_datadir}/cr
 cp -a mime.types $RPM_BUILD_ROOT%{_datadir}/cr
-cp -a db/ConfRoom.base $RPM_BUILD_ROOT%{_sysconfdir}/ConfRoom.conf
-cat %{SOURCE1} >> $RPM_BUILD_ROOT%{_sysconfdir}/ConfRoom.conf
-ln -s %{_sysconfdir}/ConfRoom.conf $RPM_BUILD_ROOT%{_libdir}/cr
+cp -a db/ConfRoom.base $RPM_BUILD_ROOT/var/lib/cr/ConfRoom.conf
+cat %{SOURCE1} >> $RPM_BUILD_ROOT/var/lib/cr/ConfRoom.conf
+ln -s %{_libdir}/cr/programs $RPM_BUILD_ROOT/var/lib/cr
+ln -s /var/log/cr $RPM_BUILD_ROOT/var/lib/cr/db/logs
+ln -s /var/log/cr/craccess.log $RPM_BUILD_ROOT/var/lib/cr/db/craccess.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
 %groupadd -g 75 ircd
-%useradd -u 75 -d %{_datadir} -g ircd -c "ConferenceRoom IRCD" ircd
+%useradd -u 75 -d /var/lib/cr -g ircd -c "ConferenceRoom IRCD" ircd
+
+%post
+for a in craccess.log chan.log nick.log services.log; do
+       if [ ! -f /var/log/cr/$a ]; then
+               touch /var/log/cr/$a
+               chown ircd:ircd /var/log/cr/$a
+       fi
+done
 
 %postun
 if [ "$1" = "0" ]; then
@@ -63,10 +71,13 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.TXT PLATFORM README RELEASE
-%dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
 %dir %{_libdir}
 %attr(755,root,root) %{_libdir}/*
 %{_datadir}/cr
-/var/lib/cr
-/var/log/cr
+%dir /var/lib/cr
+%config(noreplace) %verify(not md5 mtime size) /var/lib/cr/*.conf
+%dir /var/lib/cr/db
+/var/lib/cr/db/craccess.log
+/var/lib/cr/db/logs
+/var/lib/cr/programs
+%dir /var/log/cr