Author: wolvverine Date: Sat Mar 29 22:39:25 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.6.24
---- Files affected: SPECS: gnokii.spec (1.123 -> 1.124) ---- Diffs: ================================================================ Index: SPECS/gnokii.spec diff -u SPECS/gnokii.spec:1.123 SPECS/gnokii.spec:1.124 --- SPECS/gnokii.spec:1.123 Wed Mar 19 17:52:05 2008 +++ SPECS/gnokii.spec Sat Mar 29 23:39:20 2008 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # TODO: -# - conditional build: X11 and static subpackage +# - conditional build: X11, smsd, security, and static subpackage # # Conditional build: %bcond_without bluetooth # build without bluetooth support @@ -9,17 +9,18 @@ %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.UTF-8): Linuksowy/uniksowy zestaw narzędzi dla telefonów komórkowych Name: gnokii -Version: 0.6.23 +Version: 0.6.24 Release: 1 Epoch: 1 License: GPL v2+ Group: Applications/Communications Source0: http://www.gnokii.org/download/gnokii/%{name}-%{version}.tar.bz2 -# Source0-md5: a2cbe925f6ceadf65730581b4dbe9f29 +# Source0-md5: 9504f650b685d259a504a7cc9ad91c2e Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}.smsd.config @@ -169,32 +170,26 @@ %build rm -rf autom4te.cache -%{__autopoint} %{__libtoolize} %{__autoheader} %{__aclocal} -I m4 %{__autoconf} %configure \ --enable-security \ - --with-xgnokiidir=%{_prefix} \ + %{!?with_x11:--with-xgnokiidir=%{_prefix}} \ %{!?with_ical:--disable-libical} \ %{!?with_usb:--disable-libusb} \ %{!?with_irda:--disable-irda} \ %{!?with_bluetooth:--disable-bluetooth} \ - %{?debug:--enable-fulldebug} + --enable-smsd \ + --enable-security \ + %{?debug:--enable-fulldebug} \ + %{!?with_pcsc:--disable-libpcsclite} # %{!?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 -%{__make} -%{__make} libpq.la -%{__make} libmysql.la -%{__make} libfile.la -cd .. +%{__make} -j1 %install rm -rf $RPM_BUILD_ROOT @@ -202,10 +197,7 @@ $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/{x,}gnokii} \ $RPM_BUILD_ROOT{%{_sysconfdir},%{_pixmapsdir},%{_desktopdir},%{_var}/log/{smsd,archive/smsd}} -%{__make} install install-includes \ - DESTDIR=$RPM_BUILD_ROOT - -%{__make} -C smsd install \ +%{__make} install \ DESTDIR=$RPM_BUILD_ROOT install Docs/sample/gnokiirc $RPM_BUILD_ROOT%{_sysconfdir}/gnokiirc @@ -220,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} @@ -250,7 +239,7 @@ %doc TODO ChangeLog MAINTAINERS %attr(755,root,root) %{_bindir}/gnokii %attr(755,root,root) %{_bindir}/sendsms -%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]* @@ -266,6 +255,7 @@ %{_datadir}/xgnokii/xpm %{_datadir}/xgnokii/help %{_desktopdir}/gnokii.desktop +%{_desktopdir}/xgnokii.desktop %{_pixmapsdir}/* %{_mandir}/man1/xgnokii.1x* @@ -276,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} @@ -288,7 +279,7 @@ %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 %{_mandir}/man8/smsd.* %attr(754,root,root) /etc/rc.d/init.d/smsd @@ -298,15 +289,15 @@ %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 @@ -314,6 +305,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.124 2008-03-29 22:39:20 wolvverine +- up to 0.6.24 + Revision 1.123 2008-03-19 16:52:05 djrzulf - updated to 23, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnokii.spec?r1=1.123&r2=1.124&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
