- fixed calendar, rel.2, STBR

Changed files:
    lms.spec -> 1.41

diff --git a/lms.spec b/lms.spec
index e9e6360cc84f6958513c3507bd88b6be41d808dd..9f5b0b1ddb377b2351fbc83a0d524bdc28bc6106 100644 (file)
--- a/lms.spec
+++ b/lms.spec
@@ -11,7 +11,7 @@ Summary:      LAN Managment System
 Summary(pl):   System Zarz±dzania Sieci± Lokaln±
 Name:          lms
 Version:       %{lmsver}.%{lmssubver}
-Release:       1
+Release:       2
 License:       GPL
 Vendor:                LMS Developers
 Group:         Networking/Utilities
@@ -22,6 +22,7 @@ Source2:      %{name}.init
 Source3:       %{name}.sysconfig
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-amd64.patch
+Patch2:                %{name}-calendar.patch
 URL:           http://lms.rulez.pl/
 %{?with_almsd:BuildRequires:   libgadu-devel}
 %{?with_almsd:BuildRequires:   mysql-devel}
@@ -145,6 +146,7 @@ wybranych us
 %ifarch amd64
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 %if %{with almsd}
@@ -173,12 +175,13 @@ install -d $RPM_BUILD_ROOT%{_sbindir} \
           $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,httpd} \
           $RPM_BUILD_ROOT/etc/lms/modules/{dns,ggnofity,nofity} \
           $RPM_BUILD_ROOT{%{_lmsvar}/{backups,templates_c},/usr/lib/lms} \
-          $RPM_BUILD_ROOT%{_lmsdir}/www/{img,doc,user}
+          $RPM_BUILD_ROOT%{_lmsdir}/www/{img,doc,user,calendar}
 
 install *.php $RPM_BUILD_ROOT%{_lmsdir}/www
 install img/* $RPM_BUILD_ROOT%{_lmsdir}/www/img
 cp -r doc/html $RPM_BUILD_ROOT%{_lmsdir}/www/doc
 cp -r lib contrib modules templates sample $RPM_BUILD_ROOT%{_lmsdir}
+mv $RPM_BUILD_ROOT%{_lmsdir}/templates/calendar.html $RPM_BUILD_ROOT%{_lmsdir}/www/calendar
 install bin/* $RPM_BUILD_ROOT%{_sbindir}
 
 install sample/%{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}