SPECS (DEVEL): lms.spec - up to 1.7.4

dzeus dzeus at pld-linux.org
Sun Nov 6 23:35:28 CET 2005 

Author: dzeus                        Date: Sun Nov  6 22:35:28 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to 1.7.4

---- Files affected:
SPECS:
   lms.spec (1.31.2.63 -> 1.31.2.63.2.1) 

---- Diffs:

================================================================
Index: SPECS/lms.spec
diff -u SPECS/lms.spec:1.31.2.63 SPECS/lms.spec:1.31.2.63.2.1
--- SPECS/lms.spec:1.31.2.63	Sun Feb 20 22:25:07 2005
+++ SPECS/lms.spec	Sun Nov  6 23:35:23 2005
@@ -1,37 +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.7
+%define		lmssubver	4
 Summary:	LAN Managment System
 Summary(pl):	System Zarządzania Siecią Lokalną
 Name:		lms
-Version:	1.5.4
-Release:	0.5
+Version:	%{lmsver}.%{lmssubver}
+Release:	1
 License:	GPL
 Vendor:		LMS Developers
 Group:		Networking/Utilities
-Source0:	http://lms.rulez.pl/download/devel/%{name}-%{version}.tar.gz
-# Source0-md5:	084cb54ef31a84834b37a8742988669b
+Source0:	http://lms.rulez.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
+# Source0-md5:	cb78d7d189291f1b1a2907694dfb844e
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-amd64.patch
-Patch2:		%{name}-makedhcpconf.patch
-Patch3:		%{name}-traffic.patch
-Patch4:		%{name}-pinger.patch
-Patch5:		%{name}-misc_mods.patch
-Patch6:		%{name}-tariff_per_node.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-iconv
@@ -58,7 +56,7 @@
 - many levels of access for LMS administrators;
 - autogenerating ipchains, iptables, dhcpd, ethers file, oidentd,
   openbsd packet filter configuration files/scripts;
-- autogenerating almost any kind of config file using templates;
+- autogenerating almost any kind of config file using templates.
 
 %description -l pl
 "LMS" jest skrótem od "LAN Management System". Jest to zestaw
@@ -80,7 +78,7 @@
 - generowanie reguł i plików konfiguracyjnych dla ipchains, iptables,
   dhcpd, oidentd, packet filtra openbsd, wpisów /etc/ethers
 - generowanie praktycznie każdego pliku konfiguracyjnego na podstawie
-  danych w bazie przy użyciu prostych szablonów;
+  danych w bazie przy użyciu prostych szablonów.
 
 %package scripts
 Summary:	LAN Managment System - scripts
@@ -100,7 +98,7 @@
 Ten pakiet zawiera skrypty do zintegrowania LMS z systemem, naliczania
 comiesięcznych opłat, powiadamiania użytkowników o ich zadłużeniu oraz
 ich automagicznego odłączania. Możesz także zbudować prawdopodobnie
-każdy typ pliku konfiguracyjnego przy użyciu lms-mgc;
+każdy typ pliku konfiguracyjnego przy użyciu lms-mgc.
 
 %package sqlpanel
 Summary:	LAN Managment System - sqlpanel module
@@ -129,16 +127,18 @@
 %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}
+Obsoletes:	lms-almsd
 
-%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.
@@ -146,32 +146,25 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-%ifarch amd64
+%if "%{_lib}" == "lib64"
 %patch1 -p1
 %endif
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %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
@@ -179,15 +172,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sbindir} \
-	   $RPM_BUILD_ROOT%{_sysconfdir} \
 	   $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,httpd} \
+	   $RPM_BUILD_ROOT/etc/lms/modules/{dns,ggnofity,nofity} \
 	   $RPM_BUILD_ROOT{%{_lmsvar}/{backups,templates_c},/usr/lib/lms} \
 	   $RPM_BUILD_ROOT%{_lmsdir}/www/{img,doc,user}
 
 install *.php $RPM_BUILD_ROOT%{_lmsdir}/www
 install img/* $RPM_BUILD_ROOT%{_lmsdir}/www/img
 cp -r doc/html $RPM_BUILD_ROOT%{_lmsdir}/www/doc
-cp -r lib modules templates sample $RPM_BUILD_ROOT%{_lmsdir}
+cp -r lib contrib modules templates sample $RPM_BUILD_ROOT%{_lmsdir}
 install bin/* $RPM_BUILD_ROOT%{_sbindir}
 
 install sample/%{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}
@@ -198,43 +191,41 @@
 install contrib/sqlpanel/*.html $RPM_BUILD_ROOT%{_lmsdir}/templates
 
 # user
-cp -r contrib/customer $RPM_BUILD_ROOT%{_lmsdir}/www/user
+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
-#cp -r daemon/modules/dns/sample $RPM_BUILD_ROOT%{_sysconfdir}/modules/nofity
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/almsd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/almsd
+cp -r daemon/modules/dns/sample $RPM_BUILD_ROOT%{_sysconfdir}/modules/dns
+cp -r daemon/modules/ggnotify/sample $RPM_BUILD_ROOT%{_sysconfdir}/modules/ggnotify
+cp -r daemon/modules/dns/sample $RPM_BUILD_ROOT%{_sysconfdir}/modules/nofity
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/lmsd
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ "$1" = "1" ]; then
-	if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then
-		echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf
-		if [ -f /var/lock/subsys/httpd ]; then
-			/usr/sbin/apachectl graceful 1>&2
-		fi
-	elif [ -d /etc/httpd/httpd.conf ]; then
-		ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf
-		if [ -f /var/lock/subsys/httpd ]; then
-			/usr/sbin/apachectl graceful 1>&2
-		fi
+if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then
+	echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf
+	if [ -f /var/lock/subsys/httpd ]; then
+		/usr/sbin/apachectl restart 1>&2
+	fi
+elif [ -d /etc/httpd/httpd.conf ]; then
+	ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf
+	if [ -f /var/lock/subsys/httpd ]; then
+		/usr/sbin/apachectl restart 1>&2
 	fi
 fi
 
-%post almsd
-/sbin/chkconfig --add almsd
-if [ -f /var/lock/subsys/almsd ]; then
-	/etc/rc.d/init.d/almsd restart >&2
+%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/almsd start\" to start almsd daemon."
+	echo "Run \"/etc/rc.d/init.d/lmsd start\" to start lmsd daemon."
 fi
 
 %preun
@@ -248,16 +239,16 @@
 		mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
 	fi
 	if [ -f /var/lock/subsys/httpd ]; then
-		/usr/sbin/apachectl graceful 1>&2
+		/usr/sbin/apachectl restart 1>&2
 	fi
 fi
 
-%preun almsd
+%preun lmsd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/almsd ]; then
-		/etc/rc.d/init.d/almsd stop >&2
+	if [ -f /var/lock/subsys/lmsd ]; then
+		/etc/rc.d/init.d/lmsd stop >&2
 	fi
-	/sbin/chkconfig --del almsd
+	/sbin/chkconfig --del lmsd
 fi
 
 %triggerpostun -- %{name} <= 1.0.4
@@ -265,11 +256,16 @@
 echo "_READ_ and upgrade LMS database:"
 echo "MySQL: /usr/share/doc/%{name}-%{version}/UPGRADE-1.0-1.5.mysql.gz"
 echo "PostgreSQL: /usr/share/doc/%{name}-%{version}/UPGRADE-1.0-1.5.pgsql.gz"
-echo
+
+%triggerpostun -- %{name} <= 1.2.0
+echo "BEWARE:" 
+echo "Automatic upgrade from LMS<= 1.2.0 is NO LONGER SUPPORTED by lms team" 
+echo "You are advised to upgrade it manually" 
+echo 
 
 %files
 %defattr(644,root,root,755)
-%doc doc/{AUTHORS,ChangeLog*,README,TODO,UPGRADE*,lms*}
+%doc doc/{AUTHORS,ChangeLog*,README,UPGRADE*,lms*}
 %dir %{_sysconfdir}
 %attr(640,root,http) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.ini
 %config(noreplace) %verify(not size mtime md5) /etc/httpd/%{name}.conf
@@ -284,18 +280,17 @@
 %{_lmsdir}/lib
 %{_lmsdir}/modules
 %exclude %{_lmsdir}/modules/sql.php
-#{_lmsdir}/contrib
+%{_lmsdir}/contrib
 %{_lmsdir}/sample
-%attr(755,root,root) %{_lmsdir}/sample/traffic_ipt.sh
+%attr(755,root,root) %{_lmsdir}/sample/traffic_ipt.pl
 %{_lmsdir}/templates
-#{_lmsdir}/config_templates
 %exclude %{_lmsdir}/templates/sql.html
 %exclude %{_lmsdir}/templates/sqlprint.html
 
 %files scripts
 %defattr(644,root,root,755)
 %dir %{_sbindir}
-%attr(755,root,root) %{_sbindir}/lms-*
+%attr(755,root,root) %{_sbindir}/*
 
 %files sqlpanel
 %defattr(644,root,root,755)
@@ -307,14 +302,14 @@
 %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,Changelog}
-%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/almsd
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/almsd
+%attr(754,root,root) /etc/rc.d/init.d/lmsd
+/etc/lms/modules/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -323,56 +318,116 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.31.2.63  2005/02/20 21:25:07  orzech
-- tariff_per_node.patch added
+Revision 1.31.2.63.2.1  2005/11/06 22:35:23  dzeus
+- up to 1.7.4
+
+Revision 1.67  2005/11/06 00:16:15  chomar
+- updated to 1.7.4
+
+Revision 1.66  2005/10/30 20:46:12  dzeus
+- up to 1.6.5 (Druhin)
+
+Revision 1.65  2005/10/27 17:44:47  arekm
+- rel 2
+
+Revision 1.64  2005/09/29 22:09:27  dzeus
+- up to 1.6.4
+
+Revision 1.63  2005/08/23 16:21:32  dzeus
+- up to 1.6.3 (security update)
+
+Revision 1.62  2005/08/11 15:20:59  dzeus
+- up to 1.6.2
+
+Revision 1.61  2005/07/19 12:00:24  snurf
+- added missing requires
+  (Iconv support is required by 'server_encoding' option!)
+
+Revision 1.60  2005/07/19 05:46:41  qboosh
+- -lmsd Obsoletes: lms-almsd
+
+Revision 1.59  2005/07/18 23:15:59  japhy
+- Calendar fix (Michal Kowalczuk)
+
+Revision 1.58  2005/07/18 22:45:26  ankry
+- changelog is language independent - so it should be in ASCII
+
+Revision 1.57  2005/07/18 22:41:15  japhy
+- Oops, UTF in commitlog
+
+Revision 1.56  2005/07/18 22:33:33  japhy
+- Updated to 1.6.1, fixed (Michal Kowalczuk)
+
+Revision 1.55  2005/06/15 21:12:57  hunter
+- upgraded patches
+
+Revision 1.54  2005/06/15 20:31:06  hunter
+- up to 1.6.0
+
+Revision 1.53  2005/05/11 14:19:33  qboosh
+- more general lib64 if
+
+Revision 1.52  2005/05/03 13:00:14  dzeus
+- up to 1.4.5 Persus
+
+Revision 1.51  2005/03/24 10:29:26  dzeus
+- rel. 2 for rebuild with mysql-4.1
+
+Revision 1.50  2005/03/23 12:35:34  gotar
+- %desc
+
+Revision 1.49  2005/03/06 11:37:30  dzeus
+- reverted version 1.5 (DEVEL), up to 1.4.4
+
+Revision 1.48  2005/02/13 20:46:53  wolvverine
+- NFY not tested
+- add md5sum
+
+Revision 1.47  2005/02/13 20:41:45  wolvverine
+- NFY not tested
+- up to 1.5.3
 
-Revision 1.31.2.62  2005/02/17 08:59:26  orzech
-- -misc-mods.patch with useful modifications
+Revision 1.46  2005/02/12 19:43:52  arekm
+- rel 1 (todo items say that these are cosmetic)
 
-Revision 1.31.2.61  2005/02/16 21:34:13  orzech
-- calendar workaround obsolete
-- R: php-iconv
+Revision 1.45  2005/01/24 07:31:29  djrzulf
+- it almost ready, but somebody can explain `TODO' ?
+- md5updated,
+- Rel 0.9,
+- STBR for AC-TEST,
 
-Revision 1.31.2.60  2005/02/16 20:08:39  orzech
-- up to 2.5.4, builds, not tested...
+Revision 1.44  2005/01/24 07:26:04  djrzulf
+- updated to 1.4.3,
 
-Revision 1.31.2.59  2004/12/17 15:51:33  paszczus
-- updated to 1.5.3
+Revision 1.43  2005/01/06 05:27:57  djrzulf
+- started update to 1.4.2,
 
-Revision 1.31.2.58  2004/11/25 18:00:07  orzech
-- better post (conditional apache messing, graceful to reload config)
+Revision 1.42  2004/12/13 19:44:33  paszczus
+- updated to 1.4.1
 
-Revision 1.31.2.57  2004/11/25 17:42:39  orzech
-- up to 1.5.2
-- updated traffic and makedhcpconf patches
-- added pinger.patch
-- rel 0.1
+Revision 1.41  2004/10/26 21:38:07  orzech
+- fixed calendar, rel.2, STBR
 
-Revision 1.31.2.56  2004/11/19 10:29:37  orzech
-- added pending patches, rel. 0.7
+Revision 1.40  2004/10/18 20:35:37  domelu
+- TODO-done: ,,almsd description''
 
-Revision 1.31.2.55  2004/10/26 22:10:13  orzech
-- almsd description from HEAD
+Revision 1.39  2004/10/18 20:32:34  ankry
+- formatting
 
-Revision 1.31.2.54  2004/10/26 22:03:44  orzech
-- strict internal deps
+Revision 1.38  2004/10/18 20:28:28  qboosh
+- missing desc, strict internal deps
 
-Revision 1.31.2.53  2004/10/26 21:30:28  orzech
-- fixed calendar
+Revision 1.37  2004/10/18 18:24:35  averne
+- works fine
 
-Revision 1.31.2.52  2004/10/26 20:47:15  orzech
-- cleanup
-- rel. 0.5 - works for me
+Revision 1.36  2004/10/18 09:23:41  domelu
+- typo
 
-Revision 1.31.2.51  2004/10/26 20:09:40  orzech
-- fixed filenames
+Revision 1.35  2004/10/18 09:22:24  domelu
+- summary and pl description for almsd
 
-Revision 1.31.2.50  2004/10/26 19:29:08  orzech
-- up to 1.5.1, rel. 0.1
-- pinger patch outdated
-- no samples in /etc
-- s/lmsd/almsd/
-- no almsd-* in scripts subpackage
+Revision 1.34  2004/10/15 14:18:30  averne
+- updated to 1.4.0
 
 Revision 1.31.2.49  2004/10/11 21:08:55  domelu
 - chmod 755 traffic_ipt.sh
================================================================

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

More information about the pld-cvs-commit mailing list