Author: adamg                        Date: Sun Jun  1 13:53:32 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated to 0.6.26
- synced with HEAD

---- Files affected:
SPECS:
   gnokii.spec (1.85.2.10 -> 1.85.2.11) 

---- Diffs:

================================================================
Index: SPECS/gnokii.spec
diff -u SPECS/gnokii.spec:1.85.2.10 SPECS/gnokii.spec:1.85.2.11
--- SPECS/gnokii.spec:1.85.2.10 Mon Oct 22 14:20:55 2007
+++ SPECS/gnokii.spec   Sun Jun  1 15:53:27 2008
@@ -1,33 +1,44 @@
 # $Revision$, $Date$
-# TODO
-# - add support: ical read support:  no
+#
+# TODO:
+#      - conditional build: X11, smsd, security, 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)
+%bcond_without x11             # build without x11
+#
 Summary:       Linux/Unix tool suite for mobile phones
-Summary(pl):   Linuksowy/uniksowy zestaw narz�dzi dla telefon�w kom�rkowych
+Summary(pl.UTF-8):     Linuksowy/uniksowy zestaw narzędzi dla telefonów 
komórkowych
 Name:          gnokii
-Version:       0.6.14
-Release:       7
+Version:       0.6.26
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Applications/Communications
 Source0:       http://www.gnokii.org/download/gnokii/%{name}-%{version}.tar.bz2
-# Source0-md5: 89449d613c7a7e765a0d8da57ef1bb88
+# Source0-md5: 60f817d8ce748fea0ec9a05b3537e08d
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.smsd.config
 Source4:       %{name}.smsd.init
 Patch0:                %{name}-pld.patch
-Patch1:                %{name}-smsdlibs.patch
 URL:           http://www.gnokii.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bluez-libs-devel >= 2.8-2
+%{?with_bluetooth:BuildRequires:       bluez-libs-devel >= 2.8-2}
 BuildRequires: flex
-BuildRequires: gettext-devel
+BuildRequires: gettext-autopoint
 BuildRequires: gtk+2-devel >= 2.0
+%{?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
@@ -38,13 +49,13 @@
 Gnokii is a Linux/Unix tool suite and (eventually) modem/fax driver
 for mobile phones.
 
-%description -l pl
-Gnokii jest zestawem narz�dzi dla Linuksa/Uniksa, oraz sterownikiem
-modemu/faksu dla telefon�w kom�rkowych.
+%description -l pl.UTF-8
+Gnokii jest zestawem narzędzi dla Linuksa/Uniksa, oraz sterownikiem
+modemu/faksu dla telefonów komórkowych.
 
 %package X11
 Summary:       Graphical Linux/Unix tool suite for mobile phones
-Summary(pl):   Zestaw narz�dzi z graficznym interfejsem dla telefon�w 
kom�rkowych
+Summary(pl.UTF-8):     Zestaw narzędzi z graficznym interfejsem dla telefonów 
komórkowych
 Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
@@ -53,42 +64,43 @@
 allows you to edit your contacts book, send/read SMS's from/in
 computer and more other features.
 
-%description X11 -l pl
-Xgnokii jest zestawem narz�dzi z graficznym interfejsem u�ytkownika do
-pracy z telefonami kom�rkowymi. Pozwalaj� one na modyfikowanie spisu
-telefon�w, wysy�anie/czytanie wiadomo�ci SMS i wiele innych rzeczy.
+%description X11 -l pl.UTF-8
+Xgnokii jest zestawem narzędzi z graficznym interfejsem użytkownika do
+pracy z telefonami komórkowymi. Pozwalają one na modyfikowanie spisu
+telefonów, wysyłanie/czytanie wiadomości SMS i wiele innych rzeczy.
 
 %package -n libgnokii
 Summary:       A gnokii shared library
-Summary(pl):   Biblioteka wsp��dzielona gnokii
+Summary(pl.UTF-8):     Biblioteka współdzielona gnokii
 Group:         Libraries
 Conflicts:     gnokii < 1:0.5.10-0.2
 
 %description -n libgnokii
 A gnokii shared library.
 
-%description -n libgnokii -l pl
-Biblioteka wsp��dzielona gnokii.
+%description -n libgnokii -l pl.UTF-8
+Biblioteka współdzielona gnokii.
 
 %package -n libgnokii-devel
 Summary:       libgnokii heades files
-Summary(pl):   Pliki nag��wkowe biblioteki libgnokii
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libgnokii
 Group:         Development/Libraries
-Requires:      XFree86-devel
 Requires:      bluez-libs-devel >= 2.8-2
 Requires:      libgnokii = %{epoch}:%{version}-%{release}
 Requires:      libusb-devel
+Requires:      xorg-lib-libX11-devel
+Requires:      xorg-lib-libXpm-devel
 Obsoletes:     gnokii-devel
 
 %description -n libgnokii-devel
 libgnokii header files.
 
-%description -n libgnokii-devel -l pl
-Pliki nag��wkowe biblioteki libgnokii.
+%description -n libgnokii-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libgnokii.
 
 %package -n libgnokii-static
 Summary:       Static libgnoki library
-Summary(pl):   Statyczna biblioteka libgnokii
+Summary(pl.UTF-8):     Statyczna biblioteka libgnokii
 Group:         Development/Libraries
 Requires:      libgnokii-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     gnokii-devel
@@ -96,12 +108,12 @@
 %description -n libgnokii-static
 Static version of libgnokii library.
 
-%description -n libgnokii-static -l pl
+%description -n libgnokii-static -l pl.UTF-8
 Statyczna wersja biblioteki libgnokii.
 
 %package smsd
 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
+Summary(pl.UTF-8):     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}
@@ -112,80 +124,80 @@
 The SMSD (SMS daemon) program is intended for receiving and sending
 SMSes.
 
-%description smsd -l pl
-Program SMSD (demon SMS) s�u�y do odbierania i wysy�ania SMS-�w.
+%description smsd -l pl.UTF-8
+Program SMSD (demon SMS) służy do odbierania i wysyłania SMS-ów.
 
 %package smsd-mysql
 Summary:       MySQL plugin for gnokii-smsd
-Summary(pl):   Wtyczka MySQL dla gnokii-smsd
+Summary(pl.UTF-8):     Wtyczka MySQL dla gnokii-smsd
 Group:         Daemons
 Requires:      gnokii-smsd = %{epoch}:%{version}-%{release}
 
 %description smsd-mysql
 MySQL plugin for gnokii-smsd.
 
-%description smsd-mysql -l pl
+%description smsd-mysql -l pl.UTF-8
 Wtyczka MySQL dla gnokii-smsd.
 
 %package smsd-pgsql
 Summary:       PostgreSQL plugin for gnokii-smsd
-Summary(pl):   Wtyczka PostgreSQL dla gnokii-smsd
+Summary(pl.UTF-8):     Wtyczka PostgreSQL dla gnokii-smsd
 Group:         Daemons
 Requires:      gnokii-smsd = %{epoch}:%{version}-%{release}
 
 %description smsd-pgsql
 PostgreSQL plugin for gnokii-smsd.
 
-%description smsd-pgsql -l pl
+%description smsd-pgsql -l pl.UTF-8
 Wtyczka PostgreSQL dla gnokii-smsd.
 
 %package smsd-file
 Summary:       file plugin for gnokii-smsd
-Summary(pl):   Wtyczka obs�ugi plik�w dla gnokii-smsd
+Summary(pl.UTF-8):     Wtyczka obsługi plików dla gnokii-smsd
 Group:         Daemons
 Requires:      gnokii-smsd = %{epoch}:%{version}-%{release}
 
 %description smsd-file
 Plain file plugin for gnokii-smsd
 
-%description smsd-file -l pl
-Wtyczka obs�ugi plik�w dla gnokii-smsd.
+%description smsd-file -l pl.UTF-8
+Wtyczka obsługi plików dla gnokii-smsd.
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 rm -rf autom4te.cache
-%{__gettextize}
 %{__libtoolize}
-%{__autoheader}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --enable-security \
-       --with-xgnokiidir=%{_prefix} \
-       %{?debug:--enable-fulldebug}
-%{__make} -j1
+       %{!?with_x11:--with-xgnokiidir=%{_prefix}} \
+       %{!?with_ical:--disable-libical} \
+       %{!?with_usb:--disable-libusb} \
+       %{!?with_irda:--disable-irda} \
+       %{!?with_bluetooth:--disable-bluetooth} \
+       --enable-smsd \
+       --enable-security \
+       %{?debug:--enable-fulldebug} \
+       %{!?with_pcsc:--disable-libpcsclite}
+#      %{!?debug:--disable-debug} \
+#      %{!?debug:--disable-xdebug} \
+#      %{!?debug:--disable-rlpdebug} \
 
-cd smsd
-%{__make}
-%{__make} libpq.la
-%{__make} libmysql.la
-%{__make} libfile.la
-cd ..
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d,logrotate.d} \
        $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/{x,}gnokii} \
-       
$RPM_BUILD_ROOT{%{_sysconfdir},%{_pixmapsdir},%{_desktopdir},%{_var}/log/{smsd,archiv/smsd}}
+       
$RPM_BUILD_ROOT{%{_sysconfdir},%{_pixmapsdir},%{_desktopdir},%{_var}/log/{smsd,archive/smsd}}
 
-%{__make} install install-docs \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__make} -C smsd install \
+%{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install Docs/sample/gnokiirc $RPM_BUILD_ROOT%{_sysconfdir}/gnokiirc
@@ -200,9 +212,6 @@
 
 # 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}
@@ -225,14 +234,12 @@
 
 %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}/todologo
 %attr(755,root,root) %{_bindir}/sendsms
-%attr(755,root,root) %{_bindir}/ppm2nokia
-%attr(755,root,root) %{_sbindir}/gnokiid
+%attr(755,root,root) %{_bindir}/gnokiid
 %attr(755,root,root) %{_sbindir}/mgnokiidev
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gnokiirc
 %{_mandir}/man1/[!x]*
@@ -241,12 +248,14 @@
 
 %files X11
 %defattr(644,root,root,755)
+%doc xgnokii/{ChangeLog,README.vcard}
 %attr(755,root,root) %{_bindir}/xgnokii
 %dir %{_datadir}/xgnokii
 %{_libdir}/xgnokii
 %{_datadir}/xgnokii/xpm
 %{_datadir}/xgnokii/help
 %{_desktopdir}/gnokii.desktop
+%{_desktopdir}/xgnokii.desktop
 %{_pixmapsdir}/*
 %{_mandir}/man1/xgnokii.1x*
 
@@ -257,6 +266,7 @@
 %files -n libgnokii-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnokii.so
+%attr(755,root,root) %{_libdir}/libgnokii.so.3
 %{_libdir}/libgnokii.la
 %{_includedir}/*.h
 %{_includedir}/%{name}
@@ -269,26 +279,25 @@
 %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
+%attr(755,root,root) %{_bindir}/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
 %attr(2750,root,logs) %dir /var/log/smsd
-%attr(2750,root,logs) %dir /var/log/archiv/smsd
+%attr(2750,root,logs) %dir /var/log/archive/smsd
 
 %files -n gnokii-smsd-mysql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/smsd/libmysql.so
+%attr(755,root,root) %{_libdir}/smsd/libsmsd_mysql.so
 
 %files -n gnokii-smsd-pgsql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/smsd/libpq.so
+%attr(755,root,root) %{_libdir}/smsd/libsmsd_pq.so
 
 %files -n gnokii-smsd-file
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/smsd/libfile.so
+%attr(755,root,root) %{_libdir}/smsd/libsmsd_file.so
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -296,6 +305,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85.2.11  2008-06-01 13:53:27  adamg
+- updated to 0.6.26
+- synced with HEAD
+
 Revision 1.85.2.10  2007-10-22 12:20:55  glen
 - rel 7
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to