- fixed init script; rel 3

[packages/lms.git] / lms.spec

diff --git a/lms.spec b/lms.spec
index 1760fec8e3ea1eff2635cd59e1bd2a2fbf5a574f..8a64ea53fe61adb322d245824f2117493f6c119b 100644 (file)
--- a/lms.spec
+++ b/lms.spec
@@ -1,50 +1,56 @@
 # TODO
-# - test build on amd64 and check /usr/lib64 patch
 # - cosmetics (sort in %%files and %%install)
 # - contrib split
 #
 # Conditional build:
 %bcond_without lmsd            # without lmsd daemon
-#
-%define                lmsver          1.10
-%define                lmssubver       4
+
+%define                lmsver          1.11
+%define                lmssubver       11
 Summary:       LAN Managment System
 Summary(pl.UTF-8):     System Zarządzania Siecią Lokalną
 Name:          lms
 Version:       %{lmsver}.%{lmssubver}
-Release:       1
+Release:       3
 License:       GPL v2
 Group:         Networking/Utilities
 Source0:       http://www.lms.org.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
-# Source0-md5: c3faf26aeeb7d6767aa0d542bf49897e
+# Source0-md5: 5f1a8cdd126107ddb0656a60f48f2d4e
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-amd64.patch
 Patch2:                %{name}-smarty.patch
+Patch3:                %{name}-sqlqueryfix.patch
 URL:           http://www.lms.org.pl/
 BuildRequires: bison
 BuildRequires: flex
 %{?with_lmsd:BuildRequires:    libgadu-devel}
 %{?with_lmsd:BuildRequires:    mysql-devel}
+BuildRequires: net-snmp-devel
 %{?with_lmsd:BuildRequires:    postgresql-devel}
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.268
+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        /usr/share/php/Smarty/plugins
+%define                _smartyplugindir        %{php_data_dir}/Smarty/plugins
 %define                _webapps        /etc/webapps
 %define                _webapp         %{name}
 
@@ -156,15 +162,19 @@ wybranych usług.
 %patch1 -p1
 %endif
 %patch2 -p1
+%patch3 -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/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
 
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
 %build
 %if %{with lmsd}