rpms/gnokii/devel .cvsignore, 1.2, 1.3 gnokii-pkgconfig.patch, 1.1, 1.2 gnokii-smsd-rename.patch, 1.1, 1.2 gnokii-xgnokii-pkgconfig.patch, 1.1, 1.2 gnokii.spec, 1.4, 1.5 sources, 1.2, 1.3 gnokii-smsd-sql.patch, 1.1, NONE

[Linus Walleij (snirkel)]

Author: snirkel

Update of /cvs/extras/rpms/gnokii/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30920

Modified Files:
	.cvsignore gnokii-pkgconfig.patch gnokii-smsd-rename.patch 
	gnokii-xgnokii-pkgconfig.patch gnokii.spec sources 
Removed Files:
	gnokii-smsd-sql.patch 
Log Message:
New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Apr 2006 18:24:59 -0000	1.2
+++ .cvsignore	11 Aug 2006 21:30:32 -0000	1.3
@@ -1 +1 @@
-gnokii-0.6.12.tar.bz2
+gnokii-0.6.13.tar.bz2

gnokii-pkgconfig.patch:

Index: gnokii-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/gnokii-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnokii-pkgconfig.patch	1 Apr 2006 18:24:59 -0000	1.1
+++ gnokii-pkgconfig.patch	11 Aug 2006 21:30:32 -0000	1.2
@@ -1,10 +1,11 @@
---- common/gnokii.pc.in~	2006-02-15 23:49:56.000000000 +0100
-+++ common/gnokii.pc.in	2006-03-05 21:40:46.000000000 +0100
+diff -ur common-orig/gnokii.pc.in common/gnokii.pc.in
+--- common-orig/gnokii.pc.in	2006-08-11 20:53:45.000000000 +0200
++++ common/gnokii.pc.in	2006-08-11 20:54:17.000000000 +0200
 @@ -6,5 +6,5 @@
  Name: gnokii
  Description: Gnokii library interface
  Version: @VERSION@
 -Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @LIBICONV@
--Cflags: -I${includedir} @CFLAGS@ @XPM_CFLAGS@
+-Cflags: -I${includedir} @XPM_CFLAGS@
 +Libs: -L${libdir} -lgnokii
 +Cflags: -I${includedir}

gnokii-smsd-rename.patch:

Index: gnokii-smsd-rename.patch
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/gnokii-smsd-rename.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnokii-smsd-rename.patch	1 Apr 2006 18:24:59 -0000	1.1
+++ gnokii-smsd-rename.patch	11 Aug 2006 21:30:32 -0000	1.2
@@ -1,63 +1,19 @@
-diff -ru smsd.orig/Makefile smsd/Makefile
---- smsd.orig/Makefile	2005-07-24 22:16:22.000000000 +0300
-+++ smsd/Makefile	2005-08-06 23:54:55.000000000 +0300
-@@ -20,7 +20,9 @@
+diff -ur smsd-orig/Makefile smsd/Makefile
+--- smsd-orig/Makefile	2006-08-11 10:14:25.000000000 +0200
++++ smsd/Makefile	2006-08-11 10:15:39.000000000 +0200
+@@ -19,7 +19,7 @@
+ TOPDIR=..
+ include $(TOPDIR)/Makefile.global
+ 
+-pkglibdir = ${libdir}/smsd
++pkglibdir = ${libdir}/gnokii-smsd
  
  SMSD_MAN=man/smsd.8
  
--CFLAGS += -DMODULES_DIR=\"${libdir}/smsd\" $(PTHREAD_CFLAGS) \
-+pkglibdir = ${libdir}/gnokii-smsd
-+
-+CFLAGS += -DMODULES_DIR=\"$(pkglibdir)\" $(PTHREAD_CFLAGS) \
- 	  $(shell $(GLIBCFLAGS))
- 
- LDLIBS += $(PTHREAD_LIBS) \
-@@ -56,7 +58,7 @@
- libpq.la: pq.lo
- 	$(LIBTOOL) --mode=link $(CC) -o libpq.la pq.lo \
- 	$(shell $(GLIBLDLIBS)) -L$(shell pg_config --libdir) -lpq \
--	-export-dynamic -avoid-version -rpath ${libdir}/smsd
-+	-export-dynamic -avoid-version -rpath $(pkglibdir)
- 
- # MySQL support
- mysql.lo: smsd.h mysql.c
-@@ -66,7 +68,7 @@
- libmysql.la: mysql.lo
- 	$(LIBTOOL) --mode=link $(CC) -o libmysql.la mysql.lo \
- 	$(shell $(GLIBLDLIBS)) $(shell mysql_config --libs) \
--	-export-dynamic -avoid-version -rpath ${libdir}/smsd
-+	-export-dynamic -avoid-version -rpath $(pkglibdir)
- 
- # File support
- file.lo: smsd.h file.c
-@@ -76,7 +78,7 @@
- libfile.la: file.lo
- 	$(LIBTOOL) --mode=link $(CC) -o libfile.la file.lo \
- 	$(shell $(GLIBLDLIBS)) \
--	-export-dynamic -avoid-version -rpath ${libdir}/smsd
-+	-export-dynamic -avoid-version -rpath $(pkglibdir)
- 
- ### End of DB Modules
- 
-@@ -90,11 +92,11 @@
- install: all
- 	$(INSTALL) -d $(DESTDIR)$(sbindir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 smsd $(DESTDIR)$(sbindir)
--	$(INSTALL) -d $(DESTDIR)${libdir}/smsd
-+	$(INSTALL) -d $(DESTDIR)$(pkglibdir)
- 	for f in $(DB_LIBS) ; do \
--	$(LIBTOOL) --mode=install $(INSTALL) $$f $(DESTDIR)${libdir}/smsd ; \
-+	$(LIBTOOL) --mode=install $(INSTALL) $$f $(DESTDIR)$(pkglibdir) ; \
- 	done
--	$(LIBTOOL) --mode=finish ${libdir}/smsd
-+	$(LIBTOOL) --mode=finish $(pkglibdir)
- 	$(INSTALL) -d $(DESTDIR)$(man8dir)
- 	$(INSTALL_DATA) $(SMSD_MAN) $(DESTDIR)$(man8dir)
- 
-diff -ru smsd.orig/man/smsd.8 smsd/man/smsd.8
---- smsd.orig/man/smsd.8	2005-07-24 22:16:22.000000000 +0300
-+++ smsd/man/smsd.8	2005-08-06 23:51:36.000000000 +0300
-@@ -1,13 +1,13 @@
+diff -ur smsd-orig/man/smsd.8 smsd/man/smsd.8
+--- smsd-orig/man/smsd.8	2006-08-11 10:14:25.000000000 +0200
++++ smsd/man/smsd.8	2006-08-11 13:34:20.000000000 +0200
+@@ -1,20 +1,20 @@
 -.TH "smsd" "8" "April  26, 2005" "" "Gnokii"
 +.TH "gnokii-smsd" "8" "April  26, 2005" "" "Gnokii"
  .SH "NAME"
@@ -71,7 +27,155 @@
  .PP 
  The
 -.B SMSD
-+.B gnokii-smsd
++.B GNOKII-SMSD
  (SMS daemon) program is intended for receiving and sending SMSes.
  
  .PP
+ The program is designed to use modules (plugins) to work with an SQL server.
+ Currently are supported PostgreSQL, MySQL and a special module 'file' which is
+ designed to work without an SQL database (see below for special instructions
+-for the file module). See option \fI--module\fR. \fBSMSD\fR uses an SQL server as a
++for the file module). See option \fI--module\fR. \fBGNOKII-SMSD\fR uses an SQL server as a
+ repository for SMSes. You must create a database (default name is 'sms') with
+ tables defined in sms.tables.{module}.sql files. Table 'inbox' is for
+ received SMSes:
+@@ -33,19 +33,19 @@
+ SMS text
+ .TP
+ .B phone
+-number of phone to use. If you use smsd without -t option you can ignore
++number of phone to use. If you use gnokii-smsd without -t option you can ignore
+ this column. See -t option below.
+ .TP
+ .B processed
+-smsd sets this always to FALSE. You can use it for another program which will parse SMSes.
++gnokii-smsd sets this always to FALSE. You can use it for another program which will parse SMSes.
+ .RE
+ 
+ .PP
+-When the phone receives an SMS, \fBSMSD\fR moves it into 'inbox' table and
++When the phone receives an SMS, \fBGNOKII-SMSD\fR moves it into 'inbox' table and
+ removes the SMS from the phone.
+ 
+ .PP
+-Table 'outbox' is for outgoing SMSes. \fBSMSD\fR periodicaly looks into this table
++Table 'outbox' is for outgoing SMSes. \fBGNOKII-SMSD\fR periodicaly looks into this table
+ and searches for lines with attribute 'processed' set to FALSE. If it find
+ such SMS, it will send SMS to 'number':
+ 
+@@ -68,12 +68,12 @@
+ 
+ .TP
+ .B phone
+-number of phone to use. If you use smsd without -t option you
++number of phone to use. If you use gnokii-smsd without -t option you
+ must not fill this column. See -t option below.
+ 
+ .TP
+ .B processed
+-new SMS must have this attribut set to FALSE. \fBSMSD\fR will send this SMS and will update 'processed' to TRUE.
++new SMS must have this attribut set to FALSE. \fBGNOKII-SMSD\fR will send this SMS and will update 'processed' to TRUE.
+ 
+ .TP
+ .B error
+@@ -92,19 +92,19 @@
+ sms will not be send after this time (default 23:59:59).
+ .RE
+ .PP
+-\fBSMSD\fR is multi threaded program. If you list processes you will see more then
+-one instance of smsd.
++\fBGNOKII-SMSD\fR is multi threaded program. If you list processes you will see more then
++one instance of gnokii-smsd.
+ 
+ .SS
+ THE FILE MODULE
+ .PP
+ This module doesn't need an SQL server to work. For incoming messages it
+ work in a way that it calls a program giving phone number, date as parameter
+-and the message text on stdin. In the smsd directory there is as example file
++and the message text on stdin. In the gnokii-smsd directory there is as example file
+ action. It shows sms data to stdout. If you want something usefull you must
+ write your own action.
+ .BR
+-For outgoing messages you can set spool directory where smsd looks
++For outgoing messages you can set spool directory where gnokii-smsd looks
+ regularly.
+ 
+ .PP
+@@ -128,12 +128,12 @@
+ .RE
+ 
+ .PP
+-The name of file is unimportant but smsd ignores all files with prefix
+-"ERR.". If smsd succesfuly sends sms, it removes file from spool directory.
+-If smsd cannot sends sms prepend file with "ERR." prefix and ignores it.
++The name of file is unimportant but gnokii-smsd ignores all files with prefix
++"ERR.". If gnokii-smsd succesfuly sends sms, it removes file from spool directory.
++If gnokii-smsd cannot sends sms prepend file with "ERR." prefix and ignores it.
+ If you use \fI-m file\fR, \fI-u\fR (\fI--user\fR) and \fI-c\fR (\fI--host\fR) will have other meaning.
+ \fI-u\fR is for action (action must be executable)
+-\fI-c\fR is for spool directory where smsd looks for smses. Smsd must have read
++\fI-c\fR is for spool directory where gnokii-smsd looks for smses. Gnokii-Smsd must have read
+ and write permissions to this directory.
+ 
+ .PP
+@@ -172,19 +172,19 @@
+ 
+ .TP
+ .BR -l,\ --libdir\ path_to_db_module
+-Specify path to DB modules. If you specify pq module, smsd searches in libdir for file libpq.so (for mysql - libmysql.so).
++Specify path to DB modules. If you specify pq module, gnokii-smsd searches in libdir for file libpq.so (for mysql - libmysql.so).
+ Do not interchange this plugins with default SQL libraries from database distribution!
+ 
+ .TP
+ .BR -f,\ --logfile\ file
+-If used, smsd will monitor sms traffic to file "file". File is
++If used, gnokii-smsd will monitor sms traffic to file "file". File is
+ reopened and closed for every message so you can simply rename or
+-delete it if you want rotate logs. If you use '-' as filename smsd
++delete it if you want rotate logs. If you use '-' as filename gnokii-smsd
+ will use standard output.
+ 
+ .TP
+ .BR -t,\ --phone\ phone_number
+-You can run more instances of smsd. One instance per phone. In this
++You can run more instances of gnokii-smsd. One instance per phone. In this
+ setup you must configure phone section in gnokiirc. For example:
+ 
+ .PD 0
+@@ -244,13 +244,13 @@
+ smsc_timeout = 10
+ .PD
+ 
+-In this setup if you run smsd without -t option it will use config
+-from global section. If you run smsd with -t 1 it will use config
++In this setup if you run gnokii-smsd without -t option it will use config
++from global section. If you run gnokii-smsd with -t 1 it will use config
+ from phone_1 and likewise with -t 2 uses phone_2. In case of use -t
+-option smsd fill phone number for incoming sms's and in outbox it
++option gnokii-smsd fill phone number for incoming sms's and in outbox it
+ looks only for sms's with the specified phone number in column
+ 'phone'. This behaviour give you possibility to run one instance
+-of smsd for every phone you have at the same time.
++of gnokii-smsd for every phone you have at the same time.
+ .RE
+ 
+ .TP
+@@ -274,7 +274,7 @@
+ 
+ .TP
+ .BR -v,\ --version
+-Shows smsd version.
++Shows gnokii-smsd version.
+ 
+ .TP
+ .BR -h,\ --help
+@@ -287,7 +287,7 @@
+ None reported.
+ 
+ .SH "AUTHOR"
+-\fBSMSD\fR was written by Jan Derfinak and contributed by other people.
++\fBGNOKII-SMSD\fR was written by Jan Derfinak and contributed by other people.
+ See also Docs/CREDITS from the Gnokii sources.
+ 
+ .SH "COPYING"

gnokii-xgnokii-pkgconfig.patch:

Index: gnokii-xgnokii-pkgconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/gnokii-xgnokii-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnokii-xgnokii-pkgconfig.patch	1 Apr 2006 18:24:59 -0000	1.1
+++ gnokii-xgnokii-pkgconfig.patch	11 Aug 2006 21:30:32 -0000	1.2
@@ -1,10 +1,11 @@
---- xgnokii/xgnokii.pc.in~	2006-02-15 23:49:56.000000000 +0100
-+++ xgnokii/xgnokii.pc.in	2006-03-08 20:52:36.000000000 +0100
+diff -ur xgnokii-orig/xgnokii.pc.in xgnokii/xgnokii.pc.in
+--- xgnokii-orig/xgnokii.pc.in	2006-08-11 20:56:15.000000000 +0200
++++ xgnokii/xgnokii.pc.in	2006-08-11 20:56:36.000000000 +0200
 @@ -7,5 +7,5 @@
  Name: xgnokii
  Description: GTK2 gnokii library interface
  Version: @XVERSION@
 -Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @LIBICONV@
--Cflags: -I${includedir} @CFLAGS@ @XPM_CFLAGS@
+-Cflags: -I${includedir} @XPM_CFLAGS@
 +Libs: -L${libdir} -lgnokii
 +Cflags: -I${includedir}


Index: gnokii.spec
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnokii.spec	12 Jun 2006 13:02:51 -0000	1.4
+++ gnokii.spec	11 Aug 2006 21:30:32 -0000	1.5
@@ -1,9 +1,8 @@
-# TODO: DKU2 kernel module (usb-serial.h missing from kernel-devel)
 # TODO: merge patches upstream where applicable
 
 Name:           gnokii
-Version:        0.6.12
-Release:        5%{?dist}
+Version:        0.6.13
+Release:        1%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -17,17 +16,14 @@
 Source6:        %{name}-smsd-README.smsd2mail
 # Patch to make gnokii use "htmlview" instead of "mozilla" as default browser
 Patch0:         %{name}-htmlview.patch
-# Patch to also guide the user on how to create the smsd database without presupposing 
-# it already exists plus a more apropriate index setup.
-Patch1:         %{name}-smsd-sql.patch
 # Patch to remove port locking and apply the system-wide /usr/sbin directory
 # to the path instead of the default /usr/local
-Patch2:         %{name}-config.patch
+Patch1:         %{name}-config.patch
 # Patch to rename smdsd to gnokii-smsd (also in doc)
-Patch3:         %{name}-smsd-rename.patch
+Patch2:         %{name}-smsd-rename.patch
 # Patch to fix the superfluous include statements
-Patch4:         %{name}-pkgconfig.patch
-Patch5:		%{name}-xgnokii-pkgconfig.patch
+Patch3:         %{name}-pkgconfig.patch
+Patch4:		%{name}-xgnokii-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -39,6 +35,7 @@
 BuildRequires:  mysql-devel
 BuildRequires:  zlib-devel
 BuildRequires:  bluez-libs-devel
+BuildRequires:	libusb-devel
 %{?_with_libical:BuildRequires: libical-devel >= 0.24}
 %if "%fedora" >= "5"
 BuildRequires:	libXt-devel
@@ -107,11 +104,10 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
+%patch1 -p0
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
-%patch5 -p0
 install -pm 644 %{SOURCE5} smsd2mail.sh
 install -pm 644 %{SOURCE6} README.smsd2mail
 # Fix up X86_64 library placement issue
@@ -264,6 +260,12 @@
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Thu Aug 10 2006 Linus Walleij <triad at df.lth.se> - 0.6.13-1
+- New upstream release.
+- New dependency on libusb for USB serial, DKU no longer needed/wanted
+  so now we have that troublesome issue resolved once and for all.
+- Remove patches to SQL files: these are now fixed upstream!
+
 * Mon Jun 12 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-4
 - Rebuilding due to changed interface on libbluetooth.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Apr 2006 18:24:59 -0000	1.2
+++ sources	11 Aug 2006 21:30:32 -0000	1.3
@@ -1 +1 @@
-846e03e7cf3581000c9d0141c2950b79  gnokii-0.6.12.tar.bz2
+7f6e71aa4765c813d2129339c73e6520  gnokii-0.6.13.tar.bz2


--- gnokii-smsd-sql.patch DELETED ---