--- a/ChangeLog	Thu Jun 12 06:17:46 2008 +0000
+++ b/ChangeLog	Thu Jun 12 07:08:49 2008 +0000
@@ -1,3 +1,9 @@
+2008-06-12  Jeff Cai<[email protected]>
+
+	* SUNWgnutls.spec:
+	Don't ship files that under GPLv3 which include some command tools and
+        header files.
+
 2008-06-12  Darren Kenny  <[email protected]>
 
 	* SUNWgnome-character-map.spec:

--- a/SUNWgnutls.spec	Thu Jun 12 06:17:46 2008 +0000
+++ b/SUNWgnutls.spec	Thu Jun 12 07:08:49 2008 +0000
@@ -71,13 +71,24 @@
 rm -rf $RPM_BUILD_ROOT
 %ifarch amd64 sparcv9
 %gnutls64.install -d %name-%version/%_arch64
-rm -rf $RPM_BUILD_ROOT%{_bindir}/%{_arch64}/psktool
+rm -r $RPM_BUILD_ROOT%{_bindir}/%_arch64
+rm  $RPM_BUILD_ROOT%{_libdir}/%_arch64/libgnutls-extra*
+rm  $RPM_BUILD_ROOT%{_libdir}/%_arch64/libgnutls-openssl*
+rm  $RPM_BUILD_ROOT%{_libdir}/%_arch64/pkgconfig/gnutls-extra.pc
+rm  $RPM_BUILD_ROOT%{_includedir}/gnutls/openssl.h
+rm  $RPM_BUILD_ROOT%{_includedir}/gnutls/extra.h
 %endif
 
 %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}/psktool
+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
 
 %if %option_with_l10n
 %else
@@ -90,16 +101,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 %files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/gnutls*
-%{_bindir}/certtool
-%{_bindir}/srptool
-%ifarch amd64 sparcv9
-%{_bindir}/%{_arch64}/gnutls*
-%{_bindir}/%{_arch64}/certtool
-%{_bindir}/%{_arch64}/srptool
-%endif
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*.so*
 %ifarch amd64 sparcv9
@@ -108,13 +109,6 @@
 
 %files devel
 %defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/libgnutls-config
-%{_bindir}/libgnutls-extra-config
-%ifarch sparcv9 amd64
-%{_bindir}/%{_arch64}/libgnutls-config
-%{_bindir}/%{_arch64}/libgnutls-extra-config
-%endif
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*
 %dir %attr (0755, root, bin) %{_libdir}
@@ -139,6 +133,9 @@
 %endif
 
 %changelog
+* Thu Jun 12 2008 - [email protected]
+  Don't ship files that under GPLv3 which include some command tools and
+  header files.
 * Thu Apr 26 2007 - [email protected]
 - set CXX to $CXX -norunpath because libtool swallows this option sometimes
   and leaves compiler paths in the binaries