--- a/ChangeLog	Fri Feb 29 11:08:09 2008 +0000
+++ b/ChangeLog	Sun Mar 02 05:01:59 2008 +0000
@@ -1,9 +1,27 @@
-2008-02-29  simon.zheng  <[email protected]>
+2008-03-02  simon.zheng  <[email protected]>
 
 	* SFEconsolekit.spec:
 	* patches/ConsoleKit-03-pam.diff:
-	Add a patch 03-pam.diff to install library pam-ck-connector which
-        serves for simple text logins, such as login, telnet.
+	  Add patch 03-pam.diff to build pam module library
+	  pam-ck-connector that registers text login session into
+	  ConsoleKit. And this library is packed as a separate
+	  package called SFEconsolekit-pam.
+	* SFExmlto.spec:
+	  By default, Solaris has already installed package
+	  SUNWgnugetopt. Let's depend on it instead of
+	  SFEgetopt.
+	* SFEgegl.spec:
+	* SFEglibmm.spec:
+	* SFEgnome-device-manager.spec:
+	* SFEgnome-power-manager.spec:
+	* SFEgnome-scan.spec:
+	* SFEsane-backends.spec:
+	* SFExsane.spec:
+	  Correct package version number. Use module version instead
+	  of %default_pkg_version.
+	* base-specs/sane-backends.spec:
+	* patches/sane-backends-02-build.diff:
+	  Bump to version 1.0.19. Add patch 02-build.diff
 
 2008-02-29 Mark Wright <[email protected]>
 

--- a/SFEconsolekit.spec	Fri Feb 29 11:08:09 2008 +0000
+++ b/SFEconsolekit.spec	Sun Mar 02 05:01:59 2008 +0000
@@ -8,6 +8,17 @@
 # build with dbus support unless --without-dbus is used
 %define with_dbus %{?_without_dbus:0}%{?!_without_dbus:1}
 
+# Option to decide whether or not build library pam_ck_connector,
+# which implements pam_sm_open_session(3PAM) and pam_sm_close_session(3PAM).
+# By default, we don't build it.
+#
+# Note: To enable this pam module, you have to manually add 
+# an entry to /etc/pam.conf after installing SFEconsolekit-pam,
+# like this.
+# "login   session required       pam_ck_connector.so debug"
+#
+%define build_pam_module 0
+
 Name:                    SFEconsolekit
 Summary:                 Framework for tracking users, login sessions, and seats.
 Version:                 0.2.10
@@ -15,9 +26,7 @@
 Source1:                 consolekit.xml
 Patch1:                  ConsoleKit-01-nox11check.diff
 Patch2:                  ConsoleKit-02-emptystruct.diff
-# Patch for install pam-ck-connector to Soalris /usr/lib/security.
-# Please note you need to add manually an entry to /etc/pam.conf
-# "other   session requisite       pam_ck_connector.so debug"
+# patch to fix Soalris build issue
 Patch3:                  ConsoleKit-03-pam.diff
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -61,6 +70,14 @@
 %include default-depend.inc
 Requires: %name
 
+%if %build_pam_module
+%package pam
+Summary:		 %{summary} - PAM module to register simple text logins. 
+SUNW_BaseDir:		 %{_basedir}
+%include default-depend.inc
+Requires: %name
+%endif
+
 %prep
 %setup -q -n ConsoleKit-%version
 %patch1 -p1
@@ -92,13 +109,16 @@
 autoheader
 automake -a -c -f 
 autoconf
-./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+./configure --prefix=%{_prefix}                     \
             --libdir=%{_libdir}                     \
             --libexecdir=%{_libexecdir}             \
             --localstatedir=%{_localstatedir}       \
             --sysconfdir=%{_sysconfdir}             \
+	    --mandir=%{_mandir}			    \
+%if %build_pam_module
 	    --enable-pam-module			    \
-	    --with-pam-module-dir=/usr/lib/security	\
+	    --with-pam-module-dir=%{_libdir}/security	\
+%endif
             --enable-rbac-shutdown=solaris.system.shutdown
 
 make
@@ -107,8 +127,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm $RPM_BUILD_ROOT%{_libdir}/security/pam*.la
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
+%if %build_pam_module
+%else
+# delete useless directory /usr/man/man8 which stores pam_ck_connector.8 
+rm -rf $RPM_BUILD_ROOT/%{_mandir}
+%endif
 
 install -d $RPM_BUILD_ROOT/var/svc/manifest/system
 install --mode=0444 %SOURCE1 $RPM_BUILD_ROOT/var/svc/manifest/system
@@ -118,20 +143,15 @@
 
 %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*
 %{_libdir}/ConsoleKit
-%{_libdir}/security/pam*.so*
 %{_libexecdir}/ck-collect-session-info
 %{_libexecdir}/ck-get-x11-server-pid
 %{_libexecdir}/ck-get-x11-display-device
 %dir %attr (0755, root, sys) %{_datadir}
 %{_datadir}/dbus-1
-%{_mandir}/man8
 
 %files root
 %defattr (-, root, sys)
@@ -151,17 +171,24 @@
 
 %files devel
 %defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*
-%dir %attr (0755, root, bin) %{_libdir}
 %dir %attr (0755, root, other) %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/*
 
+%if %build_pam_module
+%files pam
+%defattr (-, root, bin)
+%{_libdir}/security/pam*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_mandir}/man8/*
+%endif
 
 %changelog
-* Fri Feb 29 2008 - [email protected]
-- Add a patch 03-pam.diff to install library pam-ck-connector which 
-  serves for simple text logins, such as login, telnet.
+* Sat Mar 01 2008 - [email protected]
+- Add a patch 03-pam.diff to build pam module library 
+  pam-ck-connector that registers text login session into 
+  ConsoleKit. And this library is packed as a separate 
+  package called SFEconsolekit-pam.
 * Mon Feb 25 2008 - [email protected]
 - Bump release to 0.2.10.  Worked with the maintainer to get seven
   recent patches upstream.

--- a/SFEgegl.spec	Fri Feb 29 11:08:09 2008 +0000
+++ b/SFEgegl.spec	Sun Mar 02 05:01:59 2008 +0000
@@ -8,7 +8,7 @@
 
 Name:                    SFEgegl
 Summary:                 GEGL (Generic Graphics Library) is a graph based image processing framework.
-Version:                 %{default_pkg_version}
+Version:                 %{gegl.version}
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
@@ -93,5 +93,7 @@
 %endif
 
 %changelog
+* Sun Mar 02 2008 - [email protected]
+- Correct package version numbers.
 * Fri Dec 14 2007 - [email protected]
 - Create

--- a/SFEglibmm.spec	Fri Feb 29 11:08:09 2008 +0000
+++ b/SFEglibmm.spec	Sun Mar 02 05:01:59 2008 +0000
@@ -8,7 +8,7 @@
 
 Name:                    SFEglibmm
 Summary:                 glibmm - C++ Wrapper for the Glib2 Library
-Version:                 %{default_pkg_version}
+Version:                 %{glibmm.version}
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 

--- a/SFEgnome-device-manager.spec	Fri Feb 29 11:08:09 2008 +0000
+++ b/SFEgnome-device-manager.spec	Sun Mar 02 05:01:59 2008 +0000
@@ -9,7 +9,7 @@
 
 Name:                    SFEgnome-device-manager
 Summary:                 GNOME Device Manager
-Version:                 %{default_pkg_version}
+Version:                 %{gdm.version}
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
@@ -119,6 +119,8 @@
 %endif
 
 %changelog
+* Sun Mar 02 2008 - [email protected]
+- Correct package version numbers.
 * Wed Oct 17 2007 - [email protected]
 - add /usr/gnu to search paths
 * Fri Aug 31 2007 - [email protected]

--- a/SFEgnome-power-manager.spec	Fri Feb 29 11:08:09 2008 +0000
+++ b/SFEgnome-power-manager.spec	Sun Mar 02 05:01:59 2008 +0000
@@ -8,7 +8,7 @@
 
 Name:                    SFEgnome-power-manager
 Summary:                 GNOME Power Manager
-Version:                 %{default_pkg_version}
+Version:                 %{gpm.version}
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 

--- a/SFEgnome-scan.spec	Fri Feb 29 11:08:09 2008 +0000
+++ b/SFEgnome-scan.spec	Sun Mar 02 05:01:59 2008 +0000
@@ -8,7 +8,7 @@
 
 Name:                    SFEgnome-scan
 Summary:                 Scanner client for the GNOME desktop
-Version:                 %{default_pkg_version}
+Version:                 %{gs.version}
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
@@ -104,6 +104,9 @@
 %endif
 
 %changelog
+* Sun Mar 02 2008 - [email protected]
+- Correct package version numbers.
+
 * Fri Dec 14 2007 - [email protected]
 - Rename SFEgnomescan.spec as SFEgnome-scan.spec.
   Add dependency on SFEgegl.

--- a/SFEsane-backends.spec	Fri Feb 29 11:08:09 2008 +0000
+++ b/SFEsane-backends.spec	Sun Mar 02 05:01:59 2008 +0000
@@ -8,7 +8,7 @@
 
 Name:                    SFEsane-backends
 Summary:                 SANE - Scanner Access Now Easy - backends
-Version:                 %{default_pkg_version}
+Version:                 %{backends.version}
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
@@ -103,6 +103,8 @@
 %endif
 
 %changelog
+* Sun Mar 02 2008 - [email protected]
+- Correct package version numbers.
 * Wed Jan 16 2008 - [email protected]
 - Added localstatedir to properly create /var instead of /usr/var
 * Tue Mar 20 2007 - [email protected]

--- a/SFExmlto.spec	Fri Feb 29 11:08:09 2008 +0000
+++ b/SFExmlto.spec	Sun Mar 02 05:01:59 2008 +0000
@@ -16,7 +16,7 @@
 %include default-depend.inc
 Requires: SUNWlxsl
 Requires: SUNWgnome-xml-share
-Requires: SFEgetopt
+Requires: SUNWgnugetopt
 Requires: SFEfindutils
 
 %prep
@@ -59,6 +59,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Mar 02 2008 - [email protected]
+- By default, Solaris has already installed package 
+  SUNWgnugetopt. Let's depend on it instead of
+  SFEgetopt.
 * Thu Feb 21 2008 - [email protected]
 - Bump to 0.0.20
 * Tue Feb 13 2007 - [email protected]

--- a/SFExsane.spec	Fri Feb 29 11:08:09 2008 +0000
+++ b/SFExsane.spec	Sun Mar 02 05:01:59 2008 +0000
@@ -8,7 +8,7 @@
 
 Name:                    SFExsane
 Summary:                 Graphical scanning frontend for the SANE scanner interface.
-Version:                 %{default_pkg_version}
+Version:                 %{xsane.version}
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
@@ -85,6 +85,8 @@
 %endif
 
 %changelog
+* Sun Mar 02 2008 - [email protected]
+- Correct package version numbers.
 * Wed Oct 17 2007 - [email protected]
 - add /usr/gnu to CFLAGS/LDFLAGS
 * Mon Apr 02 2007 - [email protected]

--- a/base-specs/sane-backends.spec	Fri Feb 29 11:08:09 2008 +0000
+++ b/base-specs/sane-backends.spec	Sun Mar 02 05:01:59 2008 +0000
@@ -5,14 +5,15 @@
 Name:         sane-backends
 License:      GPL
 Group:        Hardware/Other
-Version:      1.0.18
+Version:      1.0.19
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      SANE - Scanner Access Now Easy - backends
-Source:	      http://alioth.debian.org/frs/download.php/1669/sane-backends-%{version}.tar.gz
+Source:	      ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.19/%{name}-%{version}.tar.gz
 # date:2007-02-25 bugzilla: owner:xz159989 type:feature
 Patch1:       sane-backends-01-disable-saned.diff
+Patch2:       sane-backends-02-build.diff
 URL:          http://www.sane-project.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 DocDir:       %{_defaultdocdir}/sane
@@ -25,6 +26,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p0
 
 %build
 %ifos linux
@@ -71,6 +73,9 @@
 %{_includedir}/*
 
 %changelog
+* Sun Mar 02 2008 - [email protected]
+- Bump to Version 1.0.19.
+- Add patch sane-backends-02-build.diff.
 * Wed Jan 16 2008 - [email protected]
 - Added localstatedir to properly create /var instead of /usr/var
 * Tue Mar 20 2007 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/sane-backends-02-build.diff	Sun Mar 02 05:01:59 2008 +0000
@@ -0,0 +1,52 @@
+--- ./sanei/sanei_tcp.c.orig	2008-02-19 14:27:47.325025000 +0800
++++ ./sanei/sanei_tcp.c	2008-02-19 14:33:03.253044000 +0800
+@@ -66,7 +66,7 @@
+ 	struct hostent *h;
+ 
+ 	DBG_INIT();
+-	DBG(1, "%s: host = %s, port = %d\n", __FUNCTION__, host, port);
++	DBG(1, "%s: host = %s, port = %d\n", __func__, host, port);
+ 
+ 	h = gethostbyname(host);
+ 
+--- ./backend/epson2_scsi.c.orig	2008-02-19 14:34:38.876220000 +0800
++++ ./backend/epson2_scsi.c	2008-02-19 14:34:59.287433000 +0800
+@@ -29,7 +29,7 @@
+ 
+ 	if (result[0] && result[0] != 0x70) {
+ 		DBG(2, "%s: sense code = 0x%02x\n",
+-			__FUNCTION__, result[0]);
++			__func__, result[0]);
+ 		return SANE_STATUS_IO_ERROR;
+ 	} else {
+ 		return SANE_STATUS_GOOD;
+--- ./backend/epson2_net.c.orig	2008-02-19 14:35:23.602446000 +0800
++++ ./backend/epson2_net.c	2008-02-19 14:36:05.061495000 +0800
+@@ -43,6 +43,7 @@
+ 
+ #include <string.h>		/* for memset and memcpy */
+ #include <stdio.h>
++#define __FUNCTION__ __func__
+ 
+ int
+ sanei_epson_net_read_raw(Epson_Scanner *s, unsigned char *buf, size_t wanted,
+--- ./backend/hp5590_cmds.c.orig	2008-02-19 14:37:22.822378000 +0800
++++ ./backend/hp5590_cmds.c	2008-02-19 14:38:01.253479000 +0800
+@@ -56,6 +56,7 @@
+ #include "hp5590_low.h"
+ #include "hp5590_cmds.h"
+ 
++#define __FUNCTION__ __func__
+ struct hp5590_model
+ {
+   enum hp_scanner_types	scanner_type;
+--- ./backend/hp5590.c.orig	2008-02-19 14:38:23.931944000 +0800
++++ ./backend/hp5590.c	2008-02-19 14:39:19.146508000 +0800
+@@ -55,6 +55,7 @@
+ #include "hp5590_cmds.c"
+ #include "hp5590_low.c"
+ 
++#define __FUNCTION__ __func__
+ /* Debug levels */
+ #define	DBG_err		0
+ #define	DBG_proc	10