SPECS: gnokii.spec - upgraded to 0.6.22, updated %doc, - bluetooth...

[gotar]

Author: gotar                        Date: Sun Dec 23 12:12:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- upgraded to 0.6.22, updated %doc,
- bluetooth, ical, irda, usb, pcsc bconds,
- fixed smsd plugins separation.

---- Files affected:
SPECS:
   gnokii.spec (1.121 -> 1.122) 

---- Diffs:

================================================================
Index: SPECS/gnokii.spec
diff -u SPECS/gnokii.spec:1.121 SPECS/gnokii.spec:1.122
--- SPECS/gnokii.spec:1.121	Sun Nov 18 19:20:06 2007
+++ SPECS/gnokii.spec	Sun Dec 23 13:12:13 2007
@@ -1,17 +1,25 @@
 # $Revision$, $Date$
 #
 # TODO:
-#	- conditional build: irda, bluetooth, libusb, ical
+#	- conditional build: X11 and static subpackage
+#
+# Conditional build:
+%bcond_without	bluetooth	# build without bluetooth support
+%bcond_without	ical		# build without iCalendar support
+%bcond_without	irda		# build without IrDA support
+%bcond_without	usb		# build without USB support (for DKU2 cables)
+%bcond_without	pcsc		# build without PC/SC Lite support (for Smart Card readers)
+#
 Summary:	Linux/Unix tool suite for mobile phones
 Summary(pl.UTF-8):	Linuksowy/uniksowy zestaw narzędzi dla telefonów komórkowych
 Name:		gnokii
-Version:	0.6.18
-Release:	3
+Version:	0.6.22
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Applications/Communications
 Source0:	http://www.gnokii.org/download/gnokii/%{name}-%{version}.tar.bz2
-# Source0-md5:	0060f876414a22914ded4201335298ad
+# Source0-md5:	15d64a4911735ee30c03a7bfa9b60f05
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.smsd.config
@@ -20,14 +28,15 @@
 URL:		http://www.gnokii.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	bluez-libs-devel >= 2.8-2
+%{?with_bluetooth:BuildRequires:	bluez-libs-devel >= 2.8-2}
 BuildRequires:	flex
 BuildRequires:	gettext-autopoint
 BuildRequires:	gtk+2-devel >= 2.0
-BuildRequires:	libical-devel
+%{?with_ical:BuildRequires:	libical-devel}
 BuildRequires:	libtool
-BuildRequires:	libusb-devel
+%{?with_usb:BuildRequires:	libusb-devel}
 BuildRequires:	mysql-devel
+%{?with_pcsc:BuildRequires:	pcsc-lite-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	postgresql-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -168,7 +177,16 @@
 %configure \
 	--enable-security \
 	--with-xgnokiidir=%{_prefix} \
+	%{!?with_ical:--disable-libical} \
+	%{!?with_usb:--disable-libusb} \
+	%{!?with_irda:--disable-irda} \
+	%{!?with_bluetooth:--disable-bluetooth} \
 	%{?debug:--enable-fulldebug}
+#	%{!?debug:--disable-debug} \
+#	%{!?debug:--disable-xdebug} \
+#	%{!?debug:--disable-rlpdebug} \
+# for now the option below makes configure not to see GTK
+#	%{!?with_pcsc:--disable-libpcsclite} \
 %{__make} -j1
 
 cd smsd
@@ -184,7 +202,7 @@
 	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/{x,}gnokii} \
 	$RPM_BUILD_ROOT{%{_sysconfdir},%{_pixmapsdir},%{_desktopdir},%{_var}/log/{smsd,archive/smsd}}
 
-%{__make} install install-docs \
+%{__make} install install-includes \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} -C smsd install \
@@ -227,8 +245,8 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc Docs/{CREDITS,DataCalls-QuickStart,README*,Bugs,FAQ,*.txt,protocol}
-%doc Docs/{sample/{gnokiirc,ppp*,ringtone,vCalendar,vCard},gnokii-{ir-howto,IrDA-Linux}}
+%doc Docs/{CREDITS,DataCalls-QuickStart,KNOWN_BUGS,README*,Bugs,FAQ,*.txt,protocol}
+%doc Docs/{sample,gnokii-{hackers-howto,ir-howto,IrDA-Linux},gnokii.nol} utils/gnapplet.sis
 %doc TODO ChangeLog MAINTAINERS
 %attr(755,root,root) %{_bindir}/gnokii
 %attr(755,root,root) %{_bindir}/sendsms
@@ -241,6 +259,7 @@
 
 %files X11
 %defattr(644,root,root,755)
+%doc xgnokii/{ChangeLog,README.vcard}
 %attr(755,root,root) %{_bindir}/xgnokii
 %dir %{_datadir}/xgnokii
 %{_libdir}/xgnokii
@@ -271,7 +290,6 @@
 %doc smsd/ChangeLog smsd/README smsd/README.MySQL smsd/README.Tru64 smsd/action smsd/*.sql
 %attr(755,root,root) %{_sbindir}/smsd
 %dir %{_libdir}/smsd
-%attr(755,root,root) %{_libdir}/smsd/*.so
 %{_mandir}/man8/smsd.*
 %attr(754,root,root) /etc/rc.d/init.d/smsd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/smsd
@@ -296,6 +314,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.122  2007-12-23 12:12:13  gotar
+- upgraded to 0.6.22, updated %doc,
+- bluetooth, ical, irda, usb, pcsc bconds,
+- fixed smsd plugins separation.
+
 Revision 1.121  2007-11-18 18:20:06  arekm
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnokii.spec?r1=1.121&r2=1.122&f=u