SPECS: lms.spec - Updated to 1.6.1, fixed (MichaÅ Kowalczuk)

[japhy]

Author: japhy                        Date: Mon Jul 18 22:33:38 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Updated to 1.6.1, fixed (Michał Kowalczuk)

---- Files affected:
SPECS:
   lms.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: SPECS/lms.spec
diff -u SPECS/lms.spec:1.55 SPECS/lms.spec:1.56
--- SPECS/lms.spec:1.55	Wed Jun 15 23:12:57 2005
+++ SPECS/lms.spec	Tue Jul 19 00:33:33 2005
@@ -1,34 +1,35 @@
 # $Revision$, $Date$
+# TODO: test build on amd64 and sheck /usr/lib64 patch
 #
 # Conditional build:
-%bcond_without	almsd		# without almsd daemon
+%bcond_without	lmsd		# without lmsd daemon
 #
 # TODO:
 # - cosmetics (sort in %%files and %%install)
 # - contrib split
 %define		lmsver		1.6
-%define		lmssubver	0
+%define		lmssubver	1
 Summary:	LAN Managment System
 Summary(pl):	System Zarządzania Siecią Lokalną
 Name:		lms
 Version:	%{lmsver}.%{lmssubver}
-Release:	1
+Release:	0.1
 License:	GPL
 Vendor:		LMS Developers
 Group:		Networking/Utilities
 Source0:	http://lms.rulez.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
-# Source0-md5:	942955f198c2d7f5b8b702ec60335729
+# Source0-md5:	b9ace330b87a6253009a56358289821e
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-amd64.patch
 URL:		http://lms.rulez.pl/
-%{?with_almsd:BuildRequires:	libgadu-devel}
-%{?with_almsd:BuildRequires:	mysql-devel}
-%{?with_almsd:BuildRequires:	postgresql-devel}
-%{?with_almsd:PreReq:		rc-scripts}
-%{?with_almsd:Requires(post,preun):	/sbin/chkconfig}
+%{?with_lmsd:BuildRequires:	libgadu-devel}
+%{?with_lmsd:BuildRequires:	mysql-devel}
+%{?with_lmsd:BuildRequires:	postgresql-devel}
+%{?with_lmsd:PreReq:		rc-scripts}
+%{?with_lmsd:Requires(post,preun):	/sbin/chkconfig}
 Requires:	php
 Requires:	php-gd
 Requires:	php-posix
@@ -125,17 +126,17 @@
 %description user -l pl
 Prosty interfejs użytkownika.
 
-%package almsd
+%package lmsd
 Summary:	LAN Managment System - LMS system backend
 Summary(pl):	LAN Managment System - backend systemu LMS
 Group:		Networking/Utilities
 Requires:	%{name} = %{version}-%{release}
 
-%description almsd
+%description lmsd
 A program to manage the server by creating configuration files based
 upon LMS database and restarting selected services.
 
-%description almsd -l pl
+%description lmsd -l pl
 Program zarządzający serwerem poprzez tworzenie plików
 konfiguracyjnych na podstawie bazy danych LMS'a i restartowanie
 wybranych usług.
@@ -148,22 +149,20 @@
 %endif
 
 %build
-%if %{with almsd}
+%if %{with lmsd}
 
 cd daemon
 
 ./configure --with-mysql
 %{__make} \
-	CC='%{__cc}' CFLAGS='%{rpmcflags} -fPIC -DUSE_MYSQL -I../..'
-mv almsd almsd-mysql
-
-rm db.o
+	CC='%{__cc}' CFLAGS='%{rpmcflags} -fPIC -DUSE_MYSQL -DLMS_LIB_DIR=\"/usr/lib/lms/\" -I../..'
+mv lmsd lmsd-mysql
 
 ./configure --with-pgsql
-%{__make} almsd \
+%{__make} lmsd \
 	CC='%{__cc}' \
-	CFLAGS='%{rpmcflags} -fPIC -DUSE_PGSQL -I../..'
-mv almsd almsd-pgsql
+	CFLAGS='%{rpmcflags} -fPIC -DUSE_PGSQL -DLMS_LIB_DIR=\"/usr/lib/lms/\" -I../..'
+mv lmsd lmsd-pgsql
 
 cd ..
 %endif
@@ -194,8 +193,8 @@
 cp -r contrib/customer/* $RPM_BUILD_ROOT%{_lmsdir}/www/user
 
 # daemon
-%if %{with almsd}
-install daemon/almsd-* $RPM_BUILD_ROOT%{_sbindir}
+%if %{with lmsd}
+install daemon/lmsd-* $RPM_BUILD_ROOT%{_sbindir}
 install daemon/modules/*/*.so $RPM_BUILD_ROOT/usr/lib/lms
 cp -r daemon/modules/dns/sample $RPM_BUILD_ROOT%{_sysconfdir}/modules/dns
 cp -r daemon/modules/ggnotify/sample $RPM_BUILD_ROOT%{_sysconfdir}/modules/ggnotify
@@ -220,12 +219,12 @@
 	fi
 fi
 
-%post almsd
+%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 almsd daemon."
+	echo "Run \"/etc/rc.d/init.d/lmsd start\" to start lmsd daemon."
 fi
 
 %preun
@@ -243,7 +242,7 @@
 	fi
 fi
 
-%preun almsd
+%preun lmsd
 if [ "$1" = "0" ]; then
 	if [ -f /var/lock/subsys/lmsd ]; then
 		/etc/rc.d/init.d/lmsd stop >&2
@@ -302,11 +301,10 @@
 %defattr(644,root,root,755)
 %{_lmsdir}/www/user
 
-%if %{with almsd}
-%files almsd
+%if %{with lmsd}
+%files lmsd
 %defattr(644,root,root,755)
-%doc daemon/lms.ini.sample
-%attr(755,root,root) %{_sbindir}/almsd-*
+%attr(755,root,root) %{_sbindir}/lmsd-*
 %attr(755,root,root) /usr/lib/lms/*.so
 %attr(754,root,root) /etc/rc.d/init.d/lmsd
 /etc/lms/modules/*
@@ -319,6 +317,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2005/07/18 22:33:33  japhy
+- Updated to 1.6.1, fixed (Michał Kowalczuk)
+
 Revision 1.55  2005/06/15 21:12:57  hunter
 - upgraded patches
 
================================================================

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