packages (DEVEL): lms/lms.spec - updated to 1.11.20120222

paszczus paszczus at pld-linux.org
Wed Feb 22 13:57:17 CET 2012 

Author: paszczus                     Date: Wed Feb 22 12:57:17 2012 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- updated to 1.11.20120222

---- Files affected:
packages/lms:
   lms.spec (1.109 -> 1.109.2.1) 

---- Diffs:

================================================================
Index: packages/lms/lms.spec
diff -u packages/lms/lms.spec:1.109 packages/lms/lms.spec:1.109.2.1
--- packages/lms/lms.spec:1.109	Thu Nov 13 23:17:43 2008
+++ packages/lms/lms.spec	Wed Feb 22 13:57:11 2012
@@ -1,14 +1,16 @@
 # $Revision$, $Date$
-# TODO
-# - test build on amd64 and check /usr/lib64 patch
+# TODO:
+# - package documents/templates/default
 # - cosmetics (sort in %%files and %%install)
-# - contrib split
+# - consider contrib and samples (re)packaging
 #
 # Conditional build:
 %bcond_without	lmsd		# without lmsd daemon
-#
-%define		lmsver		1.10
-%define		lmssubver	5
+%bcond_with	lmsd_debug	# with lmsd debugging
+
+%define		lmsver		1.11
+%define		lmssubver	13
+%define		snapshot	20120222	
 Summary:	LAN Managment System
 Summary(pl.UTF-8):	System Zarządzania Siecią Lokalną
 Name:		lms
@@ -16,8 +18,9 @@
 Release:	1
 License:	GPL v2
 Group:		Networking/Utilities
-Source0:	http://www.lms.org.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
-# Source0-md5:	512b0ef7540758e65a7439cc7ab7ac52
+#Source0:	http://www.lms.org.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
+Source0:	%{name}-%{snapshot}.tar.bz2
+# Source0-md5:	6aea20eee052bdce86ca86dd195f0138
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -29,39 +32,45 @@
 BuildRequires:	flex
 %{?with_lmsd:BuildRequires:	libgadu-devel}
 %{?with_lmsd:BuildRequires:	mysql-devel}
-%{?with_lmsd:BuildRequires:	postgresql-devel}
+BuildRequires:	net-snmp-devel
+%{?with_lmsd:BuildRequires:	postgresql-devel >= 8.2}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.461
+BuildRequires:	yacc
 %{?with_lmsd:Requires(post,preun):	/sbin/chkconfig}
 Requires:	Smarty >= 2.6.18-2
 Requires:	php(gd)
 Requires:	php(iconv)
+Requires:	php(mbstring)
+Requires:	php(mysql)
 Requires:	php(pcre)
 Requires:	php(posix)
 Requires:	webapps
+Requires:	webserver(access)
+Requires:	webserver(alias)
 Requires:	webserver(php)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/%{name}
-%define		_lmsdir		%{_datadir}/%{name}
-%define		_lmsvar		/var/lib/%{name}
-%define		_smartyplugindir	%{php_data_dir}/Smarty/plugins
 %define		_webapps	/etc/webapps
 %define		_webapp		%{name}
+%define		_smartyplugindir	%{php_data_dir}/Smarty/plugins
+%define		_lmsdir		%{_datadir}/%{name}
+%define		_lmsvar		/var/lib/%{name}
 
 %description
 This is a package of applications in PHP and Perl for managing LANs.
 It's using MySQL or PostgreSQL. The main goal is to get the best
 service of users at provider's level. The main features in LMS are:
 - database of users (name, surname, address, telephone number,
-  commentary);
-- database of computers (IP, MAC);
-- easy-ridden financial system and funds of network;
-- different subscriptions;
-- sending warnings to users;
-- many levels of access for LMS administrators;
+  commentary),
+- database of computers (IP, MAC),
+- easy-ridden financial system and funds of network,
+- different subscriptions,
+- sending warnings to users,
+- many levels of access for LMS administrators,
 - autogenerating ipchains, iptables, dhcpd, ethers file, oidentd,
-  openbsd packet filter configuration files/scripts;
+  openbsd packet filter configuration files/scripts,
 - autogenerating almost any kind of config file using templates.
 
 %description -l pl.UTF-8
@@ -73,16 +82,16 @@
 providera z prawdziwego zdarzenia. Najbardziej podstawowe cechy LMS
 to:
 - baza danych użytkowników (imię, nazwisko, adres, numer telefonu,
-  uwagi);
-- baza danych komputerów (adres IP, adres MAC);
+  uwagi),
+- baza danych komputerów (adres IP, adres MAC),
 - prowadzenie prostego rachunku operacji finansowych oraz stanu
-  funduszów sieci;
-- różne taryfy abonamentowe;
-- wysyłanie pocztą elektroniczną upomnień do użytkowników;
-- automatyczne naliczanie opłat miesięcznych;
-- różne poziomy dostępu do funkcji LMS dla administratorów;
+  funduszów sieci,
+- różne taryfy abonamentowe,
+- wysyłanie pocztą elektroniczną upomnień do użytkowników,
+- automatyczne naliczanie opłat miesięcznych,
+- różne poziomy dostępu do funkcji LMS dla administratorów,
 - generowanie reguł i plików konfiguracyjnych dla ipchains, iptables,
-  dhcpd, oidentd, packet filtra openbsd, wpisów /etc/ethers
+  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.
 
@@ -150,6 +159,28 @@
 konfiguracyjnych na podstawie bazy danych LMS-a i restartowanie
 wybranych usług.
 
+%package userpanel
+Summary:	LAN Managment System - Userpanel
+Summary(pl.UTF-8):	System Zarządzania Siecią Lokalną - Panel Użytkownika
+Group:		Networking/Utilities
+Requires:	%{name} = %{version}-%{release}
+
+%description userpanel
+Userpanel is automated virtual customer service, based on LMS and
+using its core features. It enables customers (or it's intended to) to
+do review their payments, change their personal details or computer
+properties, modify subscriptions, submit problems, track their
+requests on Helpdesk and print invoices. It means, it makes a closer
+contact with their ISP.
+
+%description userpanel -l pl.UTF-8
+Userpanel jest opartą na szkielecie LMS (i ściśle z LMS
+współpracującą) implementacją tzw. e-boku. Umożliwia (albo będzie
+umożliwiał) klientom przeglądanie stanu swoich wpłat, zmianę swoich
+danych osobowych, edycję właściwości swoich komputerów, zmianę taryf,
+zgłaszanie błędów oraz awarii do Helpdesku, wydruk faktur oraz
+formularza przelewu.
+
 %prep
 %setup -q -n %{name}
 %patch0 -p1
@@ -159,80 +190,88 @@
 %patch2 -p1
 
 mkdir smarty-plugins
-mv \
-lib/Smarty/plugins/block.t.php \
-lib/Smarty/plugins/function.{bankaccount,gentime,handle,number,size,sum,tip}.php \
-lib/Smarty/plugins/modifier.{money_format,striphtml,to_words}.php \
+%{__mv} \
+	lib/Smarty/plugins/block.t.php \
+	lib/Smarty/plugins/function.{bankaccount,gentime,handle,memory,number,size,sum,tip}.php \
+	lib/Smarty/plugins/modifier.{money_format,striphtml,to_words}.php \
 	smarty-plugins
-rm -rf lib/Smarty
+%{__rm} -r lib/Smarty
+
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 %{__rm}
 
 %build
 %if %{with lmsd}
-
 cd daemon
 
-./configure --with-mysql
+./configure --with-mysql %{?with_lmsd_debug:--enable-debug0 --enable-debug1}
 %{__make} \
 	CC='%{__cc}' \
 	CFLAGS='%{rpmcflags} -fPIC -DUSE_MYSQL -DLMS_LIB_DIR=\"%{_libdir}/lms/\" -I../..'
 mv lmsd lmsd-mysql
 
-./configure --with-pgsql
+./configure --with-pgsql %{?with_lmsd_debug:--enable-debug0 --enable-debug1}
 %{__make} lmsd \
 	CC='%{__cc}' \
 	CFLAGS='%{rpmcflags} -fPIC -DUSE_PGSQL -DLMS_LIB_DIR=\"%{_libdir}/lms/\" -I../..'
 mv lmsd lmsd-pgsql
 
+CFLAGS="%{rpmcflags}" %{__make} -j1 -C modules/parser \
+	CC='%{__cc}'
+
 cd ..
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sbindir} \
-	   $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
-	   $RPM_BUILD_ROOT/etc/lms/modules/{dns,ggnofity,nofity} \
-	   $RPM_BUILD_ROOT{%{_lmsvar}/{backups,templates_c,documents},%{_libdir}/lms} \
-	   $RPM_BUILD_ROOT%{_lmsdir}/www/{img,doc,user} \
-	   $RPM_BUILD_ROOT%{_lmsdir}/www/img/core \
-	   $RPM_BUILD_ROOT%{_smartyplugindir}
-
-install *.php $RPM_BUILD_ROOT%{_lmsdir}/www
-install img/core/* $RPM_BUILD_ROOT%{_lmsdir}/www/img/core/*
-install img/*.gif $RPM_BUILD_ROOT%{_lmsdir}/www/img
-install img/*.jpg $RPM_BUILD_ROOT%{_lmsdir}/www/img
-install img/*.png $RPM_BUILD_ROOT%{_lmsdir}/www/img
-install img/*.css $RPM_BUILD_ROOT%{_lmsdir}/www/img
-install img/*.js $RPM_BUILD_ROOT%{_lmsdir}/www/img
-install img/*.fdb $RPM_BUILD_ROOT%{_lmsdir}/www/img
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_libdir}/%{name},%{_webapps}/%{_webapp}} \
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,lms/modules} \
+	$RPM_BUILD_ROOT%{_smartyplugindir} \
+	$RPM_BUILD_ROOT%{_lmsdir}/{lms,userpanel,www/{doc,user,userpanel/modules}} \
+	$RPM_BUILD_ROOT%{_lmsvar}/{backups,documents,templates_c,userpanel/templates_c}
+
+cp -a *.php img $RPM_BUILD_ROOT%{_lmsdir}/www
 cp -a doc/html $RPM_BUILD_ROOT%{_lmsdir}/www/doc
-cp -a lib contrib modules templates sample $RPM_BUILD_ROOT%{_lmsdir}
-install bin/* $RPM_BUILD_ROOT%{_sbindir}
+cp -a contrib lib modules sample templates $RPM_BUILD_ROOT%{_lmsdir}
 cp -a smarty-plugins/* $RPM_BUILD_ROOT%{_smartyplugindir}
+cp -a bin/* $RPM_BUILD_ROOT%{_sbindir}
 
-install sample/%{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}
+%{__mv} $RPM_BUILD_ROOT{%{_lmsdir}/sample/%{name}.ini,%{_sysconfdir}}
 
-install -d $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
 
 # sqlpanel
-install contrib/sqlpanel/sql.php $RPM_BUILD_ROOT%{_lmsdir}/modules
-install contrib/sqlpanel/*.html $RPM_BUILD_ROOT%{_lmsdir}/templates
+%{__mv} $RPM_BUILD_ROOT%{_lmsdir}/{contrib/sqlpanel/sql*.php,modules}
+%{__mv} $RPM_BUILD_ROOT%{_lmsdir}/{contrib/sqlpanel/*.html,templates}
 
 # user
-cp -r contrib/customer/* $RPM_BUILD_ROOT%{_lmsdir}/www/user
+%{__mv} $RPM_BUILD_ROOT%{_lmsdir}/{contrib/customer/*,www/user}
 
 # daemon
 %if %{with lmsd}
-install daemon/lmsd-* $RPM_BUILD_ROOT%{_sbindir}
-install daemon/modules/*/*.so $RPM_BUILD_ROOT%{_libdir}/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 daemon/lmsd-*sql $RPM_BUILD_ROOT%{_sbindir}
+install daemon/modules/*/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+for module in dns ggnotify notify; do
+	cp -a daemon/modules/$module/sample $RPM_BUILD_ROOT%{_sysconfdir}/modules/$module
+done
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/lmsd
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 %endif
 
+#userpanel
+cp -a userpanel/{lib,modules,templates} $RPM_BUILD_ROOT%{_lmsdir}/userpanel
+cp -a userpanel/{index.php,style} $RPM_BUILD_ROOT%{_lmsdir}/www/userpanel
+ln -s %{_lmsdir}/www/userpanel/style	$RPM_BUILD_ROOT%{_lmsdir}/userpanel
+ln -s %{_lmsvar}/userpanel/templates_c	$RPM_BUILD_ROOT%{_lmsdir}/userpanel
+
+for MODULE in $RPM_BUILD_ROOT%{_lmsdir}/userpanel/modules/*; do
+	MODULE=$(basename $MODULE)
+	mkdir $RPM_BUILD_ROOT%{_lmsdir}/www/userpanel/modules/$MODULE
+	ln -s %{_lmsdir}/userpanel/modules/$MODULE/style \
+		$RPM_BUILD_ROOT%{_lmsdir}/www/userpanel/modules/$MODULE
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -266,46 +305,42 @@
 %dir %attr(750,root,http) %{_webapps}/%{_webapp}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf
-%{_smartyplugindir}/*
+%{_smartyplugindir}/*.php
 #
 %dir %{_lmsvar}
 %attr(770,root,http) %{_lmsvar}/backups
-%attr(770,root,http) %{_lmsvar}/templates_c
 %attr(770,root,http) %{_lmsvar}/documents
+%attr(770,root,http) %{_lmsvar}/templates_c
 #
 %dir %{_lmsdir}
-%{_lmsdir}/www
-%exclude %{_lmsdir}/www/user
 %{_lmsdir}/lib
 %{_lmsdir}/modules
 %exclude %{_lmsdir}/modules/sql.php
+%exclude %{_lmsdir}/modules/sqllang.php
+%{_lmsdir}/templates
+%exclude %{_lmsdir}/templates/sql.html
+%exclude %{_lmsdir}/templates/sqlprint.html
+%{_lmsdir}/www
+%exclude %{_lmsdir}/www/user
+%exclude %{_lmsdir}/www/userpanel
 %{_lmsdir}/contrib
 %dir %{_lmsdir}/sample
 %{_lmsdir}/sample/crontab-entry
-%{_lmsdir}/sample/lms-mgc-netx-sample.ini
-%{_lmsdir}/sample/lms-mgc.ini
-%{_lmsdir}/sample/lms.apache.conf
-%{_lmsdir}/sample/lms.ini
-%{_lmsdir}/sample/mailtemplate.txt
-%{_lmsdir}/sample/mailtemplate_en.txt
+%{_lmsdir}/sample/lms-mgc*.ini
+%{_lmsdir}/sample/*.conf
+%{_lmsdir}/sample/*.txt
 %{_lmsdir}/sample/rc.lmsd
 %{_lmsdir}/sample/rc.reminder_1st
-%{_lmsdir}/sample/smstemplate.txt
-%{_lmsdir}/sample/tekst_1.txt
-%{_lmsdir}/sample/test.txt
 %attr(755,root,root) %{_lmsdir}/sample/traffic_ipt.pl
 
-%{_lmsdir}/templates
-%exclude %{_lmsdir}/templates/sql.html
-%exclude %{_lmsdir}/templates/sqlprint.html
-
 %files scripts
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/lms-*
 
 %files sqlpanel
 %defattr(644,root,root,755)
 %{_lmsdir}/modules/sql.php
+%{_lmsdir}/modules/sqllang.php
 %{_lmsdir}/templates/sql.html
 %{_lmsdir}/templates/sqlprint.html
 
@@ -316,7 +351,7 @@
 %if %{with lmsd}
 %files lmsd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/lmsd-*
+%attr(755,root,root) %{_sbindir}/lmsd-*sql
 %dir %{_libdir}/lms
 %attr(755,root,root) %{_libdir}/lms/*.so
 %attr(754,root,root) /etc/rc.d/init.d/lmsd
@@ -327,12 +362,116 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %endif
 
+%files userpanel
+%defattr(644,root,root,755)
+%dir %{_lmsdir}/userpanel
+%{_lmsdir}/userpanel/lib
+%{_lmsdir}/userpanel/modules
+%{_lmsdir}/userpanel/templates
+%{_lmsdir}/userpanel/templates_c
+%{_lmsdir}/userpanel/style
+%dir %{_lmsdir}/www/userpanel
+%{_lmsdir}/www/userpanel/style
+%{_lmsdir}/www/userpanel/index.php
+%dir %{_lmsvar}/userpanel
+%attr(770,root,http) %{_lmsvar}/userpanel/templates_c
+
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109.2.1  2012/02/22 12:57:11  paszczus
+- updated to 1.11.20120222
+
+Revision 1.135  2012/01/08 20:55:41  gotar
+- remove lmsd* from scripts subpackage, list them once in lmsd only, rel. 5
+
+Revision 1.134  2012/01/08 20:31:03  gotar
+- restored one directory, rel. 4
+
+Revision 1.133  2012/01/08 20:26:22  gotar
+- make -j1 parser module
+
+Revision 1.132  2012/01/08 20:18:26  gotar
+- build parser (tscript) module, fixed typos (it's noTiFy not noFiTy!),
+- preserve timestamps, do not duplicate packaged contrib files (+sqllang),
+- use more shell patterns and macros for commands that might be interactive,
+- tons of cosmetics, rel. 3
+
+Revision 1.131  2011/07/30 19:52:46  arekm
+- release 2
+
+Revision 1.130  2011/04/09 10:06:26  paszczus
+- updated to 1.11.13
+- removed Patch3 and Patch4, applied upstream
+
+Revision 1.129  2011/04/07 06:10:29  paszczus
+- added lms-promotionlist.php.patch; rel 3
+
+Revision 1.128  2011/03/31 18:12:06  arekm
+- release 2
+
+Revision 1.127  2011/03/30 10:50:09  paszczus
+- removed outdated patches
+- added lms-quicksearch.php.patch
+
+Revision 1.126  2011/03/20 16:25:44  gzohop
+- file permisions
+
+Revision 1.125  2011/03/20 14:37:20  gzohop
+- up to 1.11.12
+- dropped lms-language.patch, lms-sqlqueryfix.patch, not needed anymore
+- updated lms-PLD.patch includes user and userpanel files
+- added userpanel package, included in lms since 1.11.4
+
+Revision 1.124  2011/02/18 09:27:33  paszczus
+- added Patch4: lms-language.php.patch from http://cvs.lms.org.pl/viewvc/Development/lms/lib/language.php?r1=1.55&r2=1.56 (Fixed UI language setting when HTTP_ACCEPT_LANGUAGE is not set)
+
+Revision 1.123  2011/02/18 08:23:46  paszczus
+- added lmsd_debug (disabled by default)
+- rel 4
+
+Revision 1.122  2011/02/11 11:08:49  paszczus
+- fixed init script; rel 3
+
+Revision 1.121  2011/02/02 06:40:44  glen
+- fix lms.x86_64: E: backup-file-in-package /usr/share/lms/contrib/customer_otherip/class.php.orig
+
+Revision 1.120  2011/01/29 20:52:22  paszczus
+- added missing memory function for Smarty
+
+Revision 1.119  2011/01/29 19:14:33  paszczus
+- added Patch3: lms-sqlqueryfix.patch
+
+Revision 1.118  2011/01/17 14:34:22  paszczus
+- updated to 1.11.11
+
+Revision 1.117  2010/11/15 11:14:58  paszczus
+- release 2
+
+Revision 1.116  2010/09/09 11:53:55  paszczus
+- added missing Rs: php(mbstring,mysql)
+
+Revision 1.115  2010/09/09 10:13:48  paszczus
+- added missing R: webserver(access,alias)
+
+Revision 1.114  2010/09/08 10:28:18  paszczus
+- updated for 1.11.10 (Kri)
+
+Revision 1.113  2010/06/06 14:48:35  arekm
+- release 2
+
+Revision 1.112  2010/04/06 14:29:04  sparky
+- BR: net-snmp-devel, yacc
+
+Revision 1.111  2010/04/02 07:03:02  dzeus
+- up to 1.10.7 (Sina)
+
+Revision 1.110  2009/04/09 10:06:09  dzeus
+- up to 1.10.6 (Hank)
+
 Revision 1.109  2008/11/13 22:17:43  dzeus
 - up to 1.10.5 (Neith)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lms/lms.spec?r1=1.109&r2=1.109.2.1&f=u

More information about the pld-cvs-commit mailing list