gammu: updated to 1.03.0

- patch updated and sent upstream

3 files changed, 89 insertions, 81 deletions

diff --git a/packages/gammu/gammu/ldflags.patch b/packages/gammu/gammu/ldflags.patch
index d476863108..90cc0fcd3f 100644
--- a/packages/gammu/gammu/ldflags.patch
+++ b/packages/gammu/gammu/ldflags.patch
@@ -1,20 +1,25 @@
---- gammu-0.99.0/cfg/Makefile.glo.orig	2004-10-11 04:38:06 +0200
-+++ gammu-0.99.0/cfg/Makefile.glo	2004-10-24 23:28:22 +0200
-@@ -124,7 +124,7 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- gammu-1.03.0/cfg/Makefile.glo~ldflags
++++ gammu-1.03.0/cfg/Makefile.glo
+@@ -126,7 +126,7 @@
  
  $(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)
  	@echo Linking gammu
--	@$(CC) $(COMMON) $(GAMMU) -lm $(LDLIBS) -o $(TOPDIR)/gammu/gammu
-+	@$(CC) $(COMMON) $(GAMMU) -lm $(LDLIBS) -o $(TOPDIR)/gammu/gammu $(LDFLAGS)
+-	@$(CC) $(COMMON) $(GAMMU) $(LDLIBS) $(SMSD_LIBS) -o $(TOPDIR)/gammu/gammu
++	@$(CC) $(COMMON) $(GAMMU) $(LDLIBS) $(SMSD_LIBS) -o $(TOPDIR)/gammu/gammu $(LDFLAGS)
  
  gammu: $(TOPDIR)/gammu/gammu
  
-@@ -134,7 +134,7 @@
+@@ -136,7 +136,7 @@
  
  $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR): $(COMMON)
  	@echo Linking libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR)
--	@$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON)
-+	@$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON) $(LDFLAGS)
+-	@$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON)
++	@$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON) $(LDFLAGS)
  	@$(LN) -s libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR)
  	@$(LN) -s libGammu.so.$(SONAME_MAJOR) $(TOPDIR)/common/libGammu.so
  
diff --git a/packages/gammu/gammu_1.02.0.bb b/packages/gammu/gammu_1.02.0.bb
deleted file mode 100644
index 967a551eb2..0000000000
--- a/packages/gammu/gammu_1.02.0.bb
+++ /dev/null
@@ -1,73 +0,0 @@
-DESCRIPTION = "GNU All Mobile Managment Utilities"
-SECTION = "console/network"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
-AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
-
-SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz \
-file://ldflags.patch;patch=1 \
-"
-
-inherit autotools
-
-do_compile () {
-	oe_runmake shared
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/gammu/misc  ${STAGING_INCDIR}/gammu/misc/coding \
-			   ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
-			   ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
-			   ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4 \
-			   ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
-			   ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
-			   ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
-			   ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
-			   ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
-			   ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
-			   ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
-			   ${STAGING_INCDIR}/gammu/protocol/alcatel
-
-	oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
-	install -m 0644 common/*.h					${STAGING_INCDIR}/gammu/
-	install -m 0644 common/misc/*.h				${STAGING_INCDIR}/gammu/misc 
-    install -m 0644 common/misc/coding/*.h		${STAGING_INCDIR}/gammu/misc/coding 
-    install -m 0644 common/phone/*.h			${STAGING_INCDIR}/gammu/phone 
-    install -m 0644 common/phone/at/*.h			${STAGING_INCDIR}/gammu/phone/at 
-    install -m 0644 common/phone/obex/*.h		${STAGING_INCDIR}/gammu/phone/obex 
-    install -m 0644 common/phone/nokia/*.h		${STAGING_INCDIR}/gammu/phone/nokia 
-    install -m 0644 common/phone/nokia/dct3/*.h	${STAGING_INCDIR}/gammu/phone/nokia/dct3 
-    install -m 0644 common/phone/nokia/dct4/*.h	${STAGING_INCDIR}/gammu/phone/nokia/dct4 
-    install -m 0644 common/phone/symbian/*.h	${STAGING_INCDIR}/gammu/phone/symbian 
-    install -m 0644 common/phone/alcatel/*.h	${STAGING_INCDIR}/gammu/phone/alcatel 
-    install -m 0644 common/service/*.h			${STAGING_INCDIR}/gammu/service 
-    install -m 0644 common/service/sms/*.h		${STAGING_INCDIR}/gammu/service/sms 
-    install -m 0644 common/service/backup/*.h	${STAGING_INCDIR}/gammu/service/backup 
-    install -m 0644 common/device/*.h			${STAGING_INCDIR}/gammu/device 
-	install -m 0644 common/device/irda/*.h		${STAGING_INCDIR}/gammu/device/irda 
-    install -m 0644 common/device/bluetoth/*.h	${STAGING_INCDIR}/gammu/device/bluetoth 
-    install -m 0644 common/device/serial/*.h	${STAGING_INCDIR}/gammu/device/serial 
-    install -m 0644 common/protocol/*.h			${STAGING_INCDIR}/gammu/protocol 
-    install -m 0644 common/protocol/at/*.h		${STAGING_INCDIR}/gammu/protocol/at 
-    install -m 0644 common/protocol/obex/*.h	${STAGING_INCDIR}/gammu/protocol/obex 
-    install -m 0644 common/protocol/nokia/*.h	${STAGING_INCDIR}/gammu/protocol/nokia 
-    install -m 0644 common/protocol/symbian/*.h	${STAGING_INCDIR}/gammu/protocol/symbian 
-    install -m 0644 common/protocol/alcatel/*.h	${STAGING_INCDIR}/gammu/protocol/alcatel
-}
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' installshared
-}
-
-PACKAGES =+ "libgammu"
-
-FILES_${PN} = "${bindir}/gammu"
-FILES_libgammu = "${libdir}/libGammu.so*"
-
-python populate_packages_prepend () {
-	help_dir = bb.data.expand('${datadir}/gammu/', d)
-	
-	do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
-}
diff --git a/packages/gammu/gammu_1.03.0.bb b/packages/gammu/gammu_1.03.0.bb
new file mode 100644
index 0000000000..f68d308fc8
--- /dev/null
+++ b/packages/gammu/gammu_1.03.0.bb
@@ -0,0 +1,76 @@
+DESCRIPTION = "GNU All Mobile Managment Utilities"
+SECTION = "console/network"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
+AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+
+SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz \
+file://ldflags.patch;patch=1 \
+"
+
+EXTRA_OECONF = "--disable-mysql"
+
+inherit autotools
+
+do_compile () {
+        oe_runmake shared
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/gammu/misc  ${STAGING_INCDIR}/gammu/misc/coding \
+                           ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
+                           ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
+                           ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4 \
+                           ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
+                           ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
+                           ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
+                           ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
+                           ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
+                           ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
+                           ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
+                           ${STAGING_INCDIR}/gammu/protocol/alcatel
+
+        oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
+
+        install -m 0644 common/*.h                      ${STAGING_INCDIR}/gammu/
+        install -m 0644 common/misc/*.h                 ${STAGING_INCDIR}/gammu/misc 
+        install -m 0644 common/misc/coding/*.h          ${STAGING_INCDIR}/gammu/misc/coding 
+        install -m 0644 common/phone/*.h                ${STAGING_INCDIR}/gammu/phone 
+        install -m 0644 common/phone/at/*.h             ${STAGING_INCDIR}/gammu/phone/at 
+        install -m 0644 common/phone/obex/*.h           ${STAGING_INCDIR}/gammu/phone/obex 
+        install -m 0644 common/phone/nokia/*.h          ${STAGING_INCDIR}/gammu/phone/nokia 
+        install -m 0644 common/phone/nokia/dct3/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct3 
+        install -m 0644 common/phone/nokia/dct4/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct4 
+        install -m 0644 common/phone/symbian/*.h        ${STAGING_INCDIR}/gammu/phone/symbian 
+        install -m 0644 common/phone/alcatel/*.h        ${STAGING_INCDIR}/gammu/phone/alcatel 
+        install -m 0644 common/service/*.h              ${STAGING_INCDIR}/gammu/service 
+        install -m 0644 common/service/sms/*.h          ${STAGING_INCDIR}/gammu/service/sms 
+        install -m 0644 common/service/backup/*.h       ${STAGING_INCDIR}/gammu/service/backup 
+        install -m 0644 common/device/*.h               ${STAGING_INCDIR}/gammu/device 
+        install -m 0644 common/device/irda/*.h          ${STAGING_INCDIR}/gammu/device/irda 
+        install -m 0644 common/device/bluetoth/*.h      ${STAGING_INCDIR}/gammu/device/bluetoth 
+        install -m 0644 common/device/serial/*.h        ${STAGING_INCDIR}/gammu/device/serial 
+        install -m 0644 common/protocol/*.h             ${STAGING_INCDIR}/gammu/protocol 
+        install -m 0644 common/protocol/at/*.h          ${STAGING_INCDIR}/gammu/protocol/at 
+        install -m 0644 common/protocol/obex/*.h        ${STAGING_INCDIR}/gammu/protocol/obex 
+        install -m 0644 common/protocol/nokia/*.h       ${STAGING_INCDIR}/gammu/protocol/nokia 
+        install -m 0644 common/protocol/symbian/*.h     ${STAGING_INCDIR}/gammu/protocol/symbian 
+        install -m 0644 common/protocol/alcatel/*.h     ${STAGING_INCDIR}/gammu/protocol/alcatel
+}
+
+do_install () {
+        oe_runmake 'DESTDIR=${D}' installshared
+}
+
+PACKAGES =+ "libgammu"
+
+FILES_${PN} = "${bindir}/gammu"
+FILES_libgammu = "${libdir}/libGammu.so*"
+
+python populate_packages_prepend () {
+        help_dir = bb.data.expand('${datadir}/gammu/', d)
+        
+        do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
+}