From: Tomek Orzechowski Date: Sat, 4 Feb 2006 17:20:45 +0000 (+0000) Subject: - up to 1.8.0 X-Git-Tag: auto/th/lms-1_8_0-1~8 X-Git-Url: http://git.pld-linux.org/?p=packages%2Flms.git;a=commitdiff_plain;h=ab4f73d434c7c877202e48697063c6f293f06acf - up to 1.8.0 Changed files: lms-PLD.patch -> 1.11 lms.spec -> 1.75 --- diff --git a/lms-PLD.patch b/lms-PLD.patch index f75dbdc..65be35b 100644 --- a/lms-PLD.patch +++ b/lms-PLD.patch @@ -1,27 +1,27 @@ --- lms/index.php-u 2005-06-15 22:48:13.000000000 +0200 +++ lms/index.php 2005-06-15 22:53:52.000000000 +0200 -@@ -85,13 +85,13 @@ - $_CONFIG[$key] = $val; +@@ -82,14 +82,14 @@ + $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']['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']['lib_dir'] = (!isset($_CONFIG['directories']['lib_dir']) ? $_CONFIG['directories']['sys_dir'].'/lib' : $_CONFIG['directories']['lib_dir']); - $_CONFIG['directories']['modules_dir'] = (!isset($_CONFIG['directories']['modules_dir']) ? $_CONFIG['directories']['sys_dir'].'/modules' : $_CONFIG['directories']['modules_dir']); - $_CONFIG['directories']['config_templates_dir'] = (!isset($_CONFIG['directories']['config_templates_dir']) ? $_CONFIG['directories']['sys_dir'].'/config_templates' : $_CONFIG['directories']['config_templates_dir']); --$_CONFIG['directories']['smarty_dir'] = (!isset($_CONFIG['directories']['smarty_dir']) ? (is_readable('/usr/share/php/smarty/libs/Smarty.class.php') ? '/usr/share/php/smarty/libs' : $_CONFIG['directories']['lib_dir'].'/Smarty') : $_CONFIG['directories']['smarty_dir']); --$_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_dir'] = (!isset($_CONFIG['directories']['smarty_dir']) ? '/usr/share/php/Smarty' : $_CONFIG['directories']['smarty_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']); - - foreach(lms_parse_ini_file($_CONFIG['directories']['lib_dir'].'/config_defaults.ini', TRUE) as $section => $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']['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']) ? $CONFIG['directories']['sys_dir'].'/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']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_dir']); + $CONFIG['directories']['config_templates_dir'] = (!isset($CONFIG['directories']['config_templates_dir']) ? $CONFIG['directories']['sys_dir'].'/config_templates' : $CONFIG['directories']['config_templates_dir']); +-$CONFIG['directories']['smarty_dir'] = (!isset($CONFIG['directories']['smarty_dir']) ? (is_readable('/usr/share/php/smarty/libs/Smarty.class.php') ? '/usr/share/php/smarty/libs' : $CONFIG['directories']['lib_dir'].'/Smarty') : $CONFIG['directories']['smarty_dir']); +-$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_dir'] = (!isset($CONFIG['directories']['smarty_dir']) ? '/usr/share/php/Smarty' : $CONFIG['directories']['smarty_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']); + + foreach(lms_parse_ini_file($CONFIG['directories']['lib_dir'].'/config_defaults.ini', TRUE) as $section => $values) --- 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 -@@ -253,7 +253,7 @@ +@@ -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: @@ -30,24 +30,25 @@ ; Directory with "modules" of LMS. That is content of /modules directory. ; By default it is subdirectory modules in sys_dir -@@ -270,13 +270,14 @@ +@@ -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/ ++; backup_dir = /var/lib/lms/backups/ - ; Directory with Smarty library + ; In that directory LMS will store uploaded documents (files). + ; By default it is subdirectory documents in sys_dir. +@@ -299,7 +299,7 @@ ; By default, subdirectory Smarty in lib_dir ; http://smarty.php.net -; smarty_dir = /usr/lib/php/Smarty -+; smarty_dir = /usr/share/php/Smarty -+ ++; smarty_dir = /usr/share/php/Smarty ; W pld jest domy¶lnie tutaj: (nie zapomnij o "poldek -i Smarty"); - ; smarty_dir = /usr/share/pear/Smarty -@@ -284,7 +285,7 @@ + ; In PLD-linux distribution it's here: (and don't forget about "poldek -i Smarty") +@@ -309,7 +309,7 @@ ; Smarty's compilation directory. Place where Smarty compile templates. ; By default it is subdirectory templates_c in sys_dir. diff --git a/lms.spec b/lms.spec index f8f6643..353412e 100644 --- a/lms.spec +++ b/lms.spec @@ -6,18 +6,18 @@ # Conditional build: %bcond_without lmsd # without lmsd daemon # -%define lmsver 1.6 -%define lmssubver 6 +%define lmsver 1.8 +%define lmssubver 0 Summary: LAN Managment System Summary(pl): System Zarz±dzania Sieci± Lokaln± Name: lms Version: %{lmsver}.%{lmssubver} -Release: 2 -License: GPL +Release: 0.1 +License: GPL v2 Vendor: LMS Developers Group: Networking/Utilities Source0: http://lms.rulez.pl/download/%{lmsver}/%{name}-%{version}.tar.gz -# Source0-md5: 8500349fc938d66504dca033abc3a5f5 +# Source0-md5: afa0680e112dc14c4fbb41d9ec2eedee Source1: %{name}.conf Source2: %{name}.init Source3: %{name}.sysconfig @@ -269,7 +269,7 @@ rm -f /etc/httpd/httpd.conf/99_%{name}.conf %files %defattr(644,root,root,755) -%doc doc/{AUTHORS,ChangeLog*,INSTALL,README,UPGRADE*,lms*} +%doc doc/{AUTHORS,ChangeLog,INSTALL,README*,lms*} %dir %{_sysconfdir} %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.ini %dir %attr(750,root,http) %{_webapps}/%{_webapp}