--- a/ChangeLog	Sat May 30 14:43:04 2009 +0000
+++ b/ChangeLog	Sun May 31 07:47:43 2009 +0000
@@ -1,3 +1,9 @@
+2009-05-31  Jeff Cai <[email protected]>
+
+	* SUNWgnutls.spec: Change shipped files since some files do not exist
+	* base-specs/gnutls.spec: Bump to 2.8.0
+	* patches/gnutls-01-not-build-example.diff: Not build doc/example
+
 2009-05-30  Lin Ma  <[email protected]>
 
 	* SUNWgnome-cd-burner.spec: Bump to 2.26.2

--- a/SUNWgnutls.spec	Sat May 30 14:43:04 2009 +0000
+++ b/SUNWgnutls.spec	Sun May 31 07:47:43 2009 +0000
@@ -97,15 +97,12 @@
 %gnutls.install -d %name-%version/%base_arch
 rm -rf $RPM_BUILD_ROOT%{_datadir}/man
 rm -rf $RPM_BUILD_ROOT%{_datadir}/info
-rm -rf $RPM_BUILD_ROOT%{_bindir}/libgnutls-extra*
-rm -rf $RPM_BUILD_ROOT%{_bindir}/gnutls*
-rm -rf $RPM_BUILD_ROOT%{_bindir}/*tool
+rm -rf $RPM_BUILD_ROOT%{_bindir}
 rm  $RPM_BUILD_ROOT%{_libdir}/libgnutls-extra*
 rm  $RPM_BUILD_ROOT%{_libdir}/libgnutls-openssl*
 rm  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gnutls-extra.pc
 rm  $RPM_BUILD_ROOT%{_includedir}/gnutls/extra.h
 rm  $RPM_BUILD_ROOT%{_includedir}/gnutls/openssl.h
-rm  $RPM_BUILD_ROOT%{_datadir}/aclocal/libgnutls-extra.m4
 # Temporary fix for ON bits that have been built against previous verison of gnutls
 # This can be removed once ON start building against snv_115, d.o.o. : 8876
 saved_pwd=`pwd`
@@ -136,7 +133,7 @@
 
 %doc -d %{base_arch}/gnutls-%{gnutls.version} AUTHORS README
 %doc(bzip2) -d  %{base_arch}/gnutls-%{gnutls.version} ChangeLog
-%doc(bzip2) -d  %{base_arch}/gnutls-%{gnutls.version} COPYING.LIB
+#%doc(bzip2) -d  %{base_arch}/gnutls-%{gnutls.version} COPYING.LIB
 %doc(bzip2) -d  %{base_arch}/gnutls-%{gnutls.version} NEWS
 %dir %attr (0755, root, other) %{_datadir}/doc
 
@@ -156,8 +153,6 @@
 
 %files devel
 %defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*
 %dir %attr (0755, root, bin) %{_libdir}
@@ -167,9 +162,6 @@
 %dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
 %{_libdir}/%{_arch64}/pkgconfig/*
 %endif
-%dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, other) %{_datadir}/aclocal
-%{_datadir}/aclocal/*
 
 #FIXME: l10n build fails on nevada
 %if %build_l10n
@@ -180,6 +172,8 @@
 %endif
 
 %changelog
+* Sun May 31 2009 - [email protected]
+- Changed some files based on 2.8.
 * Thu Oct 15 2008 - [email protected]
 - Remove the temporary softlink libgnutls.so.13 
 * Wed Sep 16 2008 - [email protected]

--- a/base-specs/gnutls.spec	Sat May 30 14:43:04 2009 +0000
+++ b/base-specs/gnutls.spec	Sun May 31 07:47:43 2009 +0000
@@ -8,7 +8,7 @@
 #
 Name:     	gnutls
 License:	LGPL v2.1
-Version: 	2.6.6
+Version: 	2.8.0
 Release:        1
 Vendor:		Sun Microsystems, Inc.
 Distribution:	Java Desktop System
@@ -22,6 +22,9 @@
 Source1: 	l10n-configure.sh
 %endif
 
+# date:2009-05-31 owner:jefftsai type:branding 
+Patch1:       gnutls-01-not-build-example.diff
+
 %define glib2_version 2.0
 %define libgcrypt_version 1.1.12
 BuildRequires:	glibc-devel
@@ -54,6 +57,7 @@
 
 %prep
 %setup  -q -n %{name}-%{version}
+%patch1 -p1
 
 %build
 %ifos linux
@@ -74,6 +78,7 @@
 %if %build_l10n
 sh %SOURCE1 --enable-copyright
 %endif
+
 ./configure \
     --prefix=%{_prefix} \
     --libdir=%{_libdir} \
@@ -108,6 +113,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon May 31 2009 - [email protected]
+- Bump to 2.8.0
+- Add path -01-not-build-example to disable building of example 
 * Mon May 04 2009 - [email protected]
 - Bump to 2.6.6
 * Fri Apr 17 2009 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnutls-01-not-build-example.diff	Sun May 31 07:47:43 2009 +0000
@@ -0,0 +1,20 @@
+--- gnutls-2.8.0/doc/Makefile.in.orig	2009-05-31 14:58:01.039912000 +0800
++++ gnutls-2.8.0/doc/Makefile.in	2009-05-31 14:59:04.854878000 +0800
+@@ -196,7 +196,7 @@
+ 	distdir
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = examples cyclo scripts manpages credentials reference
++DIST_SUBDIRS = cyclo scripts manpages credentials reference
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
+   dir0=`pwd`; \
+@@ -746,7 +746,7 @@
+ EXTRA_DIST = TODO README.gaa certtool.cfg gnutls.ps gnutls.pdf \
+ 	gnutls.html extract-guile-c-doc.scm doxygen/Doxyfile.in \
+ 	doxygen/Doxyfile.orig texinfo.css $(guile_texi)
+-SUBDIRS = examples cyclo scripts manpages credentials $(am__append_1)
++SUBDIRS = cyclo scripts manpages credentials $(am__append_1)
+ info_TEXINFOS = gnutls.texi
+ 
+ # Generated texinfos.