SPECS (AC-branch): lms.spec - up to 1.6.8, merged changes from HEAD

[dzeus]

Author: dzeus                        Date: Wed May 31 16:40:23 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- up to 1.6.8, merged changes from HEAD

---- Files affected:
SPECS:
   lms.spec (1.74.2.2 -> 1.74.2.3) 

---- Diffs:

================================================================
Index: SPECS/lms.spec
diff -u SPECS/lms.spec:1.74.2.2 SPECS/lms.spec:1.74.2.3
--- SPECS/lms.spec:1.74.2.2	Thu Apr 20 23:14:36 2006
+++ SPECS/lms.spec	Wed May 31 18:40:17 2006
@@ -8,16 +8,16 @@
 %bcond_without	lmsd		# without lmsd daemon
 #
 %define		lmsver		1.6
-%define		lmssubver	7
+%define		lmssubver	8
 Summary:	LAN Managment System
 Summary(pl):	System Zarządzania Siecią Lokalną
 Name:		lms
 Version:	%{lmsver}.%{lmssubver}
 Release:	1
-License:	GPL
+License:	GPL v2
 Group:		Networking/Utilities
 Source0:	http://lms.rulez.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
-# Source0-md5:	773eb4da0f97848886487d82b5c51417
+# Source0-md5:	370dbffe2f204a7f284c20c74f1d1259
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -27,15 +27,14 @@
 %{?with_lmsd:BuildRequires:	libgadu-devel}
 %{?with_lmsd:BuildRequires:	mysql-devel}
 %{?with_lmsd:BuildRequires:	postgresql-devel}
-%{?with_lmsd:Requires(post,preun):	/sbin/chkconfig}
 BuildRequires:	rpmbuild(macros) >= 1.268
+%{?with_lmsd:Requires(post,preun):	/sbin/chkconfig}
 Requires:	Smarty >= 2.6.10-4
 Requires:	php
 Requires:	php-gd
 Requires:	php-iconv
 Requires:	php-pcre
 Requires:	php-posix
-%{?with_lmsd:Requires: rc-scripts}
 Requires:	webapps
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -133,6 +132,8 @@
 Summary:	LAN Managment System - LMS system backend
 Summary(pl):	LAN Managment System - backend systemu LMS
 Group:		Networking/Utilities
+Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 Obsoletes:	lms-almsd
 
 %description lmsd
@@ -141,7 +142,7 @@
 
 %description lmsd -l pl
 Program zarządzający serwerem poprzez tworzenie plików
-konfiguracyjnych na podstawie bazy danych LMS'a i restartowanie
+konfiguracyjnych na podstawie bazy danych LMS-a i restartowanie
 wybranych usług.
 
 %prep
@@ -290,7 +291,6 @@
 
 %files scripts
 %defattr(644,root,root,755)
-%dir %{_sbindir}
 %attr(755,root,root) %{_sbindir}/*
 
 %files sqlpanel
@@ -307,9 +307,13 @@
 %files lmsd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/lmsd-*
+%dir %{_libdir}/lms
 %attr(755,root,root) %{_libdir}/lms/*.so
 %attr(754,root,root) /etc/rc.d/init.d/lmsd
-/etc/lms/modules/*
+# XXX: dir shared with base
+%dir %{_sysconfdir}
+%dir %{_sysconfdir}/modules
+%{_sysconfdir}/modules/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %endif
 
@@ -319,6 +323,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74.2.3  2006/05/31 16:40:17  dzeus
+- up to 1.6.8, merged changes from HEAD
+
 Revision 1.74.2.2  2006/04/20 21:14:36  dzeus
 - cosmetics
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/lms.spec?r1=1.74.2.2&r2=1.74.2.3&f=u