--- a/ChangeLog	Fri Feb 22 10:59:45 2008 +0000
+++ b/ChangeLog	Fri Feb 22 12:14:24 2008 +0000
@@ -1,11 +1,16 @@
+2008-02-22  Damien Carbery <[email protected]>
+
+        * SUNWsqlite3.spec: Added back because the versions going into snv do
+	  not deliver a sqlite3.pc file so breaking dependant packages.
+        * base-specs/sqlite.spec: Added back again.
+
 2008-02-22  Darren Kenny  <[email protected]>
 
-	* SUNWxdg-user-dirs-gtk.spec:
-	  Integrate new package to provide a GTK UI for handling SUNWxdg-user-dirs.
-	* SUNWxdg-user-dirs.spec,
-	  patches/xdg-user-dirs-01-bugs.diff,
-	  patches/xdg-user-dirs-02-enable-nls.diff:
-	  Move from spec-files-other/core.
+	* SUNWxdg-user-dirs-gtk.spec: Integrate new package to provide a GTK UI
+	  for handling SUNWxdg-user-dirs.
+	* SUNWxdg-user-dirs.spec, patches/xdg-user-dirs-01-bugs.diff,
+	  patches/xdg-user-dirs-02-enable-nls.diff: Move from
+	  spec-files-other/core.
 
 2008-02-21  Brian Cameron  <[email protected]>
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SUNWsqlite3.spec	Fri Feb 22 12:14:24 2008 +0000
@@ -0,0 +1,115 @@
+#
+# spec file for package SUNWsqlite3
+#
+# includes module(s): sqlite
+#
+# Copyright (c) 2007 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Owner: hawklu
+#
+%include Solaris.inc
+
+%use sqlite = sqlite.spec
+
+Name:           SUNWsqlite3
+Summary:        SQLite - a C library that implements an embeddable SQL database engine
+Version:        %{default_pkg_version}
+SUNW_BaseDir:   %{_basedir}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+BuildRequires: SUNWfirefox3
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir:   %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+rm -rf %name-%version
+mkdir -p %name-%version
+%sqlite.prep -d %name-%version
+
+%build
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+export CFLAGS="%optflags -mt -DSOLARIS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ -DSQLITE_ENABLE_REDEF_IO"
+export LDFLAGS="%{_ldflags}"
+export RPM_OPT_FLAGS="$CFLAGS"
+%sqlite.build -d %name-%version
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%sqlite.install -d %name-%version
+cd %{_builddir}/%name-%version
+
+%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*
+
+%files devel 
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+
+
+%changelog
+* Wed Jan 09 2008 - [email protected]
+- Add fake dependency "BuildRequires: SUNWfirefox3" to make FF 3 build
+  ahead of Sqlite, would remove it when FF 3 is able to compile with 
+  SUNWsqlite
+* Fri Jan 04 2008 - [email protected]
+- Port sqlite spec files from SFE to JDS repos
+* Wed Jan 02 2008 - [email protected]
+- Rename from SFEsqlite to SUNWsqlite.
+* Mon Nov 12 2007 - [email protected]
+- Spilit into sqlite.spec
+- Tue Oct 09 2007 - [email protected]
+- Revert back to 3.4.2.  Found crashing problems running the examples
+  in pysqlite with the 3.5.1 version.
+* Fri Oct 05 2007 - [email protected]
+- Bump to 3.5.1
+* Mon Sep 17 2007 - [email protected]
+- Add -DSQLITE_ENABLE_REDEF_IO to CFLAGS for firefox3.
+* Thu Sep 06 2007 - [email protected]
+- Bump to 3.4.2, 3.5.0 is still alpha.
+- Uncomment patch1.
+* Wed Sep 05 2007 - [email protected]
+- Bump to 3.5.0
+- Comment patch1, seems no crash when run sqlite and opensync,
+  will contact patch owner laca.
+* Mon Jul 30 2007 - [email protected]
+- Bump to 3.4.1
+* Thu May 03 2007 - [email protected]
+- Add --enable-threads-override-locks and --disable-debug option for tracker.
+* Thu May 03 2007 - [email protected]
+- Bump to 3.3.17.
+* Wed Feb 28 2007 - [email protected]
+- bump to 3.3.13 as source for 3.3.8 is no longer available
+* Tue Nov 11 2006 - [email protected]
+- Rename from SUNWsqlite3 to SUNWsqlite
+- Bump to 3.3.8
+* Wed Sep  7 2006 - [email protected]
+- bump to 3.3.7
+* Mon Jul 10 2006 - [email protected]
+- rename to SFEsqlite3
+- move to /usr
+- update file attributes
+- delete unnecessary env variables
+- add patch thread-lock-test.diff: it disables a thread locking behaviour
+  test on Solaris and hardcodes the result of the test, which I obtained
+  by separating this code into a test program.  The thread operations
+  in this test conflict with thread operations in the hans boehm garbage
+  collector and crash mono apps that attempt to use sqlite3.
+* Fri Mar 17 2006 - [email protected]
+- Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/sqlite.spec	Fri Feb 22 12:14:24 2008 +0000
@@ -0,0 +1,107 @@
+#
+# spec file for package sqlite
+#
+# Copyright (c) 2007 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Owner: hawklu 
+#
+
+Name:           sqlite
+License:        Public Domain
+Group:          System/Libraries
+Version:        3.5.4
+Release:        4
+Distribution:   Java Desktop System
+Vendor:         Sun Microsystems, Inc.
+URL:            http://www.sqlite.org
+Summary:        SQLite - a C library that implements an embeddable SQL database engine
+Source:         http://www.sqlite.org/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+
+%description
+SQLite is a C library that implements an embeddable SQL database engine.
+Programs that link with the SQLite library can have SQL database access
+without running a separate RDBMS process. The distribution comes with a
+standalone command-line access program (sqlite) that can be used to
+administer an SQLite database and which serves as an example of how to
+use the SQLite library.
+
+%package devel
+Summary: Header files and libraries for developing apps which will use %{name}
+Group: Development/C
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The sqlite-devel package contains the header files and libraries needed
+to develop programs that use the sqlite database library.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+  CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+  CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+  CPUS=1
+fi
+
+./configure --prefix=%{_prefix} \
+	--bindir=%{_bindir} \
+	--mandir=%{_mandir} \
+	--libdir=%{_libdir} \
+	--datadir=%{_datadir} \
+	--includedir=%{_includedir} \
+	--sysconfdir=%{_sysconfdir} \
+	--enable-static=no                  \
+	--enable-releasemode                \
+	--enable-threadsafe                 \
+	--disable-tcl                       \
+	--disable-cross-thread-connections  \
+	--enable-tempstore                  \
+	--enable-threads-override-locks     \
+	--disable-debug                     
+
+make -j $CPUS
+
+%install
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make -i install DESTDIR=$RPM_BUILD_ROOT
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files
+%defattr(-, root, root)
+%{_libdir}/*.so*
+%{_bindir}/*
+
+%files devel
+%defattr(-, root, root)
+%{_libdir}/pkgconfig/sqlite3.pc
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_includedir}/*
+
+%changelog
+* Fri Jan 04 2008 - [email protected]
+- Port sqlite spec files from SFE to JDS repos
+* Mon Nov 12 2007 - [email protected]
+- Bump to 3.5.2.
+- Remove upstreamed patch thread-lock-test.diff.
+- Initial version, spilit from SFEsqlite.spec