--- a/ChangeLog	Mon Jan 21 09:32:41 2008 +0000
+++ b/ChangeLog	Mon Jan 21 18:46:24 2008 +0000
@@ -1,3 +1,13 @@
+2008-01-21 Moinak Ghosh <[email protected]>
+	* SFEgnokii.spec
+	* patches/gnokii-01-uint8.diff
+	* patches/gnokii-02-utils.diff
+	* patches/gnokii-03-makefile.diff
+	* patches/libmal-01-ap_snprintf.diff
+	  Added mobile phone interfacing utilities package.
+	* SFElibmal.spec
+	  Added malsync library needed by kdepim.
+
 2008-01-21  simon.zheng  <[email protected]>
 
 	* base-specs/gnome-power-manager.spec:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEgnokii.spec	Mon Jan 21 18:46:24 2008 +0000
@@ -0,0 +1,89 @@
+#
+# spec file for package SFEopenexr.spec
+#
+# Copyright (c) 2008 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
+%include Solaris.inc
+
+Name:                   SFEgnokii
+Summary:                Tools and user-space drivers for interfacing with mobiles phones esp. Nokia
+Version:                0.6.22
+Source:                 http://www.gnokii.org/download/gnokii/gnokii-0.6.22.tar.bz2
+Patch1:                 gnokii-01-uint8.diff
+Patch2:                 gnokii-02-utils.diff
+Patch3:                 gnokii-03-makefile.diff
+
+SUNW_BaseDir:           %{_basedir}
+BuildRoot:              %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SFElibical
+BuildRequires: SFElibical-devel
+Requires: SFEgettext
+BuildRequires: SFEgettext-devel
+Requires: SFElibiconv
+BuildRequires: SFElibiconv-devel
+
+%prep
+%setup -q -n gnokii-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+    CPUS=1
+fi
+
+export CFLAGS="%optflags -I/usr/gnu/include"
+export LDFLAGS="%_ldflags -L/usr/gnu/lib -R/usr/gnu/lib -lintl -liconv"
+./configure --prefix=%{_prefix}		\
+	    --mandir=%{_mandir}		\
+            --datadir=%{_datadir}	\
+            --sysconfdir=%{_sysconfdir} \
+            --enable-shared=yes		\
+	    --enable-static=no		\
+            --with-libiconv-prefix=/usr/gnu \
+            --with-libintl-prefix=/usr/gnu
+
+
+make -j$CPUS 
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
+mv $RPM_BUILD_ROOT/%{_prefix}/man/man1/xgnokii.1x $RPM_BUILD_ROOT/%{_mandir}/man1/
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/man
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_sbindir}
+%{_sbindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/doc
+%{_datadir}/doc/*
+%dir %attr (0755, root, other) %{_datadir}/xgnokii
+%{_datadir}/xgnokii/*
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/*
+%dir %attr (0755, root, bin) %{_mandir}
+%{_mandir}/*
+
+%defattr (-, root, other)
+%dir %attr (0755, root, other) %{_datadir}/locale
+%{_datadir}/locale/*
+
+%changelog
+* Mon Jan  21 2008 - [email protected]
+- Initial spec.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibmal.spec	Mon Jan 21 18:46:24 2008 +0000
@@ -0,0 +1,69 @@
+#
+# spec file for package SFEopenexr.spec
+#
+# Copyright (c) 2008 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
+%include Solaris.inc
+
+Name:                   SFElibmal
+Summary:                A library of the functions in malsync
+Version:                0.44
+Source:                 http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz
+Patch1:                 libmal-01-ap_snprintf.diff
+
+SUNW_BaseDir:           %{_basedir}
+BuildRoot:              %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SUNWpilot-link
+BuildRequires: SUNWpilot-link-devel
+
+%prep
+%setup -q -n libmal-%{version}
+%patch1 -p1
+
+%build
+if [ "x`basename $CC`" != xgcc ]
+then
+	%error This spec file requires Gcc, set the CC and CXX env variables
+fi
+
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+    CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+./configure --prefix=%{_prefix}		\
+	    --mandir=%{_mandir}		\
+            --datadir=%{_datadir}	\
+            --sysconfdir=%{_sysconfdir} \
+            --enable-shared=yes		\
+	    --enable-static=no
+
+
+make -j$CPUS 
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755,root,bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755,root,bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr(0755, root, bin) %{_includedir}
+%{_includedir}/*
+
+%changelog
+* Mon Jan  21 2008 - [email protected]
+- Initial spec.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnokii-01-uint8.diff	Mon Jan 21 18:46:24 2008 +0000
@@ -0,0 +1,31 @@
+--- gnokii-0.6.22/include/compat.h.orig	2008-01-21 22:37:18.461126000 +0530
++++ gnokii-0.6.22/include/compat.h	2008-01-21 22:37:28.342497000 +0530
+@@ -285,7 +285,7 @@
+ #endif
+ 
+ #ifndef HAVE_U_INT8_T
+-	typedef u_int_8_t;
++	typedef unsigned char u_int_8_t;
+ #endif
+ 
+ #ifdef HAVE_WCRTOMB
+--- gnokii-0.6.22/include/devices/dku2libusb.h.orig	2008-01-21 22:42:01.665681000 +0530
++++ gnokii-0.6.22/include/devices/dku2libusb.h	2008-01-21 22:42:11.446219000 +0530
+@@ -92,12 +92,12 @@
+ /* "Union Functional Descriptor" from CDC spec 5.2.3.X
+  * used to find data/slave DKU2 FBUS interface */
+ struct cdc_union_desc {
+-	u_int8_t      bLength;
+-	u_int8_t      bDescriptorType;
+-	u_int8_t      bDescriptorSubType;
++	uint8_t      bLength;
++	uint8_t      bDescriptorType;
++	uint8_t      bDescriptorSubType;
+ 
+-	u_int8_t      bMasterInterface0;
+-	u_int8_t      bSlaveInterface0;
++	uint8_t      bMasterInterface0;
++	uint8_t      bSlaveInterface0;
+ } __attribute__ ((packed));
+ 
+ /* Nokia is the vendor we are interested in */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnokii-02-utils.diff	Mon Jan 21 18:46:24 2008 +0000
@@ -0,0 +1,15 @@
+--- gnokii-0.6.22/gnokii/gnokii-utils.c.orig	2008-01-21 22:56:48.744208000 +0530
++++ gnokii-0.6.22/gnokii/gnokii-utils.c	2008-01-21 22:57:18.462032000 +0530
+@@ -44,6 +44,12 @@
+ #include <stdio.h>
+ #include <signal.h>
+ 
++#if defined(__sun__) || defined (__sun)
++#include <fcntl.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#endif
++
+ #include "gnokii-app.h"
+ #include "gnokii.h"
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnokii-03-makefile.diff	Mon Jan 21 18:46:24 2008 +0000
@@ -0,0 +1,21 @@
+--- gnokii-0.6.22/xgnokii/Makefile.orig	2007-11-24 17:01:01.000000000 +0530
++++ gnokii-0.6.22/xgnokii/Makefile	2008-01-21 23:35:24.928984000 +0530
+@@ -51,10 +51,14 @@
+ 	$(LIBTOOL) --mode=install $(INSTALL) xgnokii $(DESTDIR)$(xbindir)
+ 	$(INSTALL) -d $(DESTDIR)$(xgnokii_libdir)/help
+ 	( cd $(HELP_DIR); \
+-	  $(FIND) . -type d \! -path "*CVS*" \
+-	       -exec $(INSTALL) -d $(DESTDIR)$(xgnokii_libdir)/help/{} \; ; \
+-	  $(FIND) . -type f \! -path "*CVS*" \
+-	       -exec $(INSTALL_DATA) {} $(DESTDIR)$(xgnokii_libdir)/help/{} \; \
++	  for d in `$(FIND) . -type d | grep -v CVS`; \
++	  do \
++	    $(INSTALL) -d $(DESTDIR)$(xgnokii_libdir)/help/$$d; \
++	  done; \
++	  for f in `$(FIND) . -type f | grep -v CVS`; \
++	  do \
++	    $(INSTALL_DATA) $$f $(DESTDIR)$(xgnokii_libdir)/help/$$f; \
++	  done; \
+ 	)
+ 	$(INSTALL_DATA) ../Docs/CREDITS $(DESTDIR)$(xgnokii_libdir)/help/en_US
+ 	$(INSTALL_DATA) ../COPYING $(DESTDIR)$(xgnokii_libdir)/help/en_US

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libmal-01-ap_snprintf.diff	Mon Jan 21 18:46:24 2008 +0000
@@ -0,0 +1,18 @@
+--- libmal-0.44/malsync/mal/common/AGUtilUnix.h.orig	2008-01-21 21:32:09.661352000 +0530
++++ libmal-0.44/malsync/mal/common/AGUtilUnix.h	2008-01-21 21:32:21.664886000 +0530
+@@ -41,15 +41,6 @@
+ #define min(a,b)  ((a) < (b) ? (a) : (b))
+ #endif /* !min */
+ 
+-#ifdef __sun__
+-#ifndef MALSYNC
+-#include <httpd.h>
+-#include <ap.h>
+-#endif
+-#define snprintf ap_snprintf
+-#define vsnprintf ap_vsnprintf
+-#endif
+-
+ #endif /* __unix__ */
+ 
+ #ifdef __cplusplus