Author: dzeus                        Date: Wed Apr 19 21:54:13 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- up to 1.6.7

---- Files affected:
SPECS:
   lms.spec (1.74 -> 1.74.2.1) 

---- Diffs:

================================================================
Index: SPECS/lms.spec
diff -u SPECS/lms.spec:1.74 SPECS/lms.spec:1.74.2.1
--- SPECS/lms.spec:1.74 Thu Feb  2 16:14:49 2006
+++ SPECS/lms.spec      Wed Apr 19 23:54:08 2006
@@ -8,17 +8,17 @@
 %bcond_without lmsd            # without lmsd daemon
 #
 %define                lmsver          1.6
-%define                lmssubver       6
+%define                lmssubver       7
 Summary:       LAN Managment System
 Summary(pl):   System Zarządzania Siecią Lokalną
 Name:          lms
 Version:       %{lmsver}.%{lmssubver}
-Release:       2
+Release:       1
 License:       GPL
 Vendor:                LMS Developers
 Group:         Networking/Utilities
 Source0:       http://lms.rulez.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
-# Source0-md5: 8500349fc938d66504dca033abc3a5f5
+# Source0-md5: 773eb4da0f97848886487d82b5c51417
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -29,6 +29,7 @@
 %{?with_lmsd:BuildRequires:    mysql-devel}
 %{?with_lmsd:BuildRequires:    postgresql-devel}
 %{?with_lmsd:Requires(post,preun):     /sbin/chkconfig}
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      Smarty >= 2.6.10-4
 Requires:      php
 Requires:      php-gd
@@ -133,7 +134,6 @@
 Summary:       LAN Managment System - LMS system backend
 Summary(pl):   LAN Managment System - backend systemu LMS
 Group:         Networking/Utilities
-Requires:      %{name} = %{version}-%{release}
 Obsoletes:     lms-almsd
 
 %description lmsd
@@ -159,7 +159,8 @@
 
 ./configure --with-mysql
 %{__make} \
-       CC='%{__cc}' CFLAGS='%{rpmcflags} -fPIC -DUSE_MYSQL 
-DLMS_LIB_DIR=\"%{_libdir}/lms/\" -I../..'
+       CC='%{__cc}' \
+       CFLAGS='%{rpmcflags} -fPIC -DUSE_MYSQL 
-DLMS_LIB_DIR=\"%{_libdir}/lms/\" -I../..'
 mv lmsd lmsd-mysql
 
 ./configure --with-pgsql
@@ -214,17 +215,11 @@
 
 %post lmsd
 /sbin/chkconfig --add lmsd
-if [ -f /var/lock/subsys/lmsd ]; then
-       /etc/rc.d/init.d/lmsd restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/lmsd start\" to start lmsd daemon."
-fi
+%service lmsd restart "lmsd daemon"
 
 %preun lmsd
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/lmsd ]; then
-               /etc/rc.d/init.d/lmsd stop >&2
-       fi
+       %service lmsd stop
        /sbin/chkconfig --del lmsd
 fi
 
@@ -325,6 +320,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74.2.1  2006/04/19 21:54:08  dzeus
+- up to 1.6.7
+
 Revision 1.74  2006/02/02 15:14:49  glen
 - update apache2 trigger to match apache-base in case somebody decides not to
   use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to