SPECS: gnokii.spec - merge from AC-branch

[glen]

Author: glen                         Date: Mon Sep 25 11:13:21 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge from AC-branch

---- Files affected:
SPECS:
   gnokii.spec (1.109 -> 1.110) 

---- Diffs:

================================================================
Index: SPECS/gnokii.spec
diff -u SPECS/gnokii.spec:1.109 SPECS/gnokii.spec:1.110
--- SPECS/gnokii.spec:1.109	Sun Sep 24 22:42:27 2006
+++ SPECS/gnokii.spec	Mon Sep 25 13:13:15 2006
@@ -3,7 +3,7 @@
 Summary(pl):	Linuksowy/uniksowy zestaw narzędzi dla telefonów komórkowych
 Name:		gnokii
 Version:	0.6.14
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2+
 Group:		Applications/Communications
@@ -27,6 +27,7 @@
 BuildRequires:	mysql-devel
 BuildRequires:	pkgconfig
 BuildRequires:	postgresql-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXpm-devel
 Requires:	libgnokii = %{epoch}:%{version}-%{release}
@@ -101,7 +102,9 @@
 Summary:	Daemon for handling incoming and outgoing SMSes using libgnokii
 Summary(pl):	Serwer do zarządzania przychodzacymi i wychodzacymi SMS-ami przy użyciu gnokii
 Group:		Daemons
+Requires(post,preun):	/sbin/chkconfig
 Requires:	gnokii = %{epoch}:%{version}-%{release}
+Requires:	rc-scripts
 Obsoletes:	smstools
 
 %description smsd
@@ -163,7 +166,7 @@
 	--enable-security \
 	--with-xgnokiidir=%{_prefix} \
 	%{?debug:--enable-fulldebug}
-%{__make}
+%{__make} -j1
 
 cd smsd
 %{__make}
@@ -194,13 +197,11 @@
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/smsd
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/smsd
 
-
 # do not complain about unpackaged files (we package them with %%doc anyway)
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 # move xgnokii manpage into proper place
 mv -f $RPM_BUILD_ROOT{%{_prefix}/man,%{_mandir}}/man1/xgnokii.1x
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/smsd/*.{la,a}
 
 %find_lang %{name}
@@ -264,7 +265,7 @@
 %defattr(644,root,root,755)
 %{_libdir}/libgnokii.a
 
-%files -n gnokii-smsd
+%files smsd
 %defattr(644,root,root,755)
 %doc smsd/ChangeLog smsd/README smsd/README.MySQL smsd/README.Tru64 smsd/action smsd/*.sql
 %attr(755,root,root) %{_sbindir}/smsd
@@ -293,6 +294,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.110  2006/09/25 11:13:15  glen
+- merge from AC-branch
+
 Revision 1.109  2006/09/24 20:42:27  glen
 - merge from AC-branch:
   - added init scritps and sysconfig for smsd with multiple phone support.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnokii.spec?r1=1.109&r2=1.110&f=u