- up to 1.9.7

Changed files:
    lms-PLD.patch -> 1.14
    lms.spec -> 1.95

diff --git a/lms-PLD.patch b/lms-PLD.patch
index 570c6e1791ec2e4751216bc03298f71c97d81e40..cfcacb048af2cb8f37cdb760edb672df54d6beb7 100644 (file)
--- a/lms-PLD.patch
+++ b/lms-PLD.patch
@@ -1,44 +1,20 @@
---- lms/index.php-u    2005-06-15 22:48:13.000000000 +0200
-+++ lms/index.php      2005-06-15 22:53:52.000000000 +0200
-@@ -82,9 +82,9 @@
+--- lms/index.php.orig 2007-05-09 10:36:59.000000000 +0200
++++ lms/index.php      2007-06-23 09:36:38.000000000 +0200
+@@ -93,13 +93,13 @@
        $CONFIG[$key] = $val;
  
  // Check for configuration vars and set default values
 -$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? getcwd() : $CONFIG['directories']['sys_dir']);
--$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? $CONFIG['directories']['sys_dir'].'/backups' : $CONFIG['directories']['backup_dir']);
--$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? $CONFIG['directories']['sys_dir'].'/documents' : $CONFIG['directories']['doc_dir']);
 +$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? '/usr/share/lms' : $CONFIG['directories']['sys_dir']);
-+$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? '/var/lib/lms/backups' : $CONFIG['directories']['backup_dir']);
-+$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? '/var/lib/lms/documents' : $CONFIG['directories']['doc_dir']);
  $CONFIG['directories']['lib_dir'] = (!isset($CONFIG['directories']['lib_dir']) ? $CONFIG['directories']['sys_dir'].'/lib' : $CONFIG['directories']['lib_dir']);
+-$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? $CONFIG['directories']['sys_dir'].'/documents' : $CONFIG['directories']['doc_dir']);
++$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? '/var/lib/lms/documents': $CONFIG['directories']['doc_dir']);
  $CONFIG['directories']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_dir']);
+-$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? $CONFIG['directories']['sys_dir'].'/backups' : $CONFIG['directories']['backup_dir']);
++$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? '/var/lib/lms/backups' : $CONFIG['directories']['backup_dir']);
  $CONFIG['directories']['config_templates_dir'] = (!isset($CONFIG['directories']['config_templates_dir']) ? $CONFIG['directories']['sys_dir'].'/config_templates' : $CONFIG['directories']['config_templates_dir']);
---- lms/sample/lms.ini.orig    2005-05-13 13:36:19.000000000 +0200
-+++ lms/sample/lms.ini 2005-06-15 23:04:30.000000000 +0200
-@@ -268,7 +268,7 @@
- ; index.php, graphics, templates and the rest. By default index.php seek in filesystem
- ; using getcwd(), but better is to say him where hi is:
- 
--; sys_dir          = /var/www/htdocs/lms/
-+; sys_dir      = /usr/share/lms/www/
- 
- ; Directory with "modules" of LMS. That is content of /modules directory.
- ; By default it is subdirectory modules in sys_dir
-@@ -285,7 +285,7 @@
- ; If directory with backups will be accessible from WWW level, then anybody will
- ; can to access them without authorization.
- 
--; backup_dir          = /var/backup/lms/
-+; backup_dir          = /var/lib/lms/backups/
- 
- ; In that directory LMS will store uploaded documents (files). 
- ; By default it is subdirectory documents in sys_dir.
-@@ -298,7 +298,7 @@
- ; Smarty's compilation directory. Place where Smarty compile templates.
- ; By default it is subdirectory templates_c in sys_dir.
- 
--; smarty_compile_dir     = /var/smarty/compile/lms
-+; smarty_compile_dir   = /var/lib/lms/templates_c
+-$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? $CONFIG['directories']['sys_dir'].'/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
++$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? '/var/lib/lms/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
+ $CONFIG['directories']['smarty_templates_dir'] = (!isset($CONFIG['directories']['smarty_templates_dir']) ? $CONFIG['directories']['sys_dir'].'/templates' : $CONFIG['directories']['smarty_templates_dir']);
  
- ; Directory with Smarty's templates.
- ; By default it is subdirectory templates in sys_dir.
+ foreach(lms_parse_ini_file($CONFIG['directories']['lib_dir'].'/config_defaults.ini', TRUE) as $section => $values)

diff --git a/lms.spec b/lms.spec
index 748bfeeace0617d82c15887f44c22711c4c5255d..fc75f94c30c61d4f331cf57f292f4d1f331b8013 100644 (file)
--- a/lms.spec
+++ b/lms.spec
@@ -7,7 +7,7 @@
 %bcond_without lmsd            # without lmsd daemon
 #
 %define                lmsver          1.9
-%define                lmssubver       5
+%define                lmssubver       7
 Summary:       LAN Managment System
 Summary(pl.UTF-8):     System Zarządzania Siecią Lokalną
 Name:          lms
@@ -15,8 +15,8 @@ Version:      %{lmsver}.%{lmssubver}
 Release:       1
 License:       GPL v2
 Group:         Networking/Utilities
-Source0:       http://lms.org.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
-# Source0-md5: f3d0284b3f2028ba74d2b8c3f52897cb
+Source0:       http://www.lms.org.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
+# Source0-md5: da8db5677a65e20654b4819a3090fdb2
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -32,7 +32,7 @@ BuildRequires:        flex
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.268
 %{?with_lmsd:Requires(post,preun):     /sbin/chkconfig}
-Requires:      Smarty >= 2.6.10-4
+Requires:      Smarty >= 2.6.18-2
 Requires:      php(gd)
 Requires:      php(iconv)
 Requires:      php(pcre)