2012-04-17 Ghee Teo <[email protected]> gnome-2-30-s11update
authorgheet
Tue, 17 Apr 2012 10:19:48 +0000
branchgnome-2-30-s11update
changeset 22381 07faad70630e
parent 22380 a3c93ffdb004
child 22382 c3b7ec31f094
2012-04-17 Ghee Teo <[email protected]> CR#7144691 Solaris 11 man pages have excessive permissions RTI#361728. * specs/SUNWgnome-gtksourceview.spec: * specs/SUNWgnome-img-viewer.spec: * specs/SUNWgnome-keyring.spec: * specs/SUNWgnome-libs.spec: * specs/SUNWgnome-media-apps.spec: * specs/SUNWlibtheora.spec: * specs/SUNWspeex.spec:
ChangeLog
specs/SUNWgnome-gtksourceview.spec
specs/SUNWgnome-img-viewer.spec
specs/SUNWgnome-keyring.spec
specs/SUNWgnome-libs.spec
specs/SUNWgnome-media-apps.spec
specs/SUNWlibtheora.spec
specs/SUNWspeex.spec
--- a/ChangeLog	Tue Apr 17 05:57:06 2012 +0000
+++ b/ChangeLog	Tue Apr 17 10:19:48 2012 +0000
@@ -1,3 +1,15 @@
+2012-04-17  Ghee Teo  <[email protected]>
+
+	CR#7144691 Solaris 11 man pages have excessive permissions
+	RTI�#361728.
+	* specs/SUNWgnome-gtksourceview.spec:
+	* specs/SUNWgnome-img-viewer.spec:
+	* specs/SUNWgnome-keyring.spec:
+	* specs/SUNWgnome-libs.spec:
+	* specs/SUNWgnome-media-apps.spec:
+	* specs/SUNWlibtheora.spec:
+	* specs/SUNWspeex.spec:
+
 2012-04-17  Brian Cameron  <[email protected]>
 
 	CR #7121864 "Continuous attempts to manage displays already being
--- a/specs/SUNWgnome-gtksourceview.spec	Tue Apr 17 05:57:06 2012 +0000
+++ b/specs/SUNWgnome-gtksourceview.spec	Tue Apr 17 10:19:48 2012 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): gtksourceview
 #
-# Copyright (c) 2003 Sun Microsystems, Inc.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -25,21 +25,19 @@
 
 %include default-depend.inc
 %include gnome-incorporation.inc
-Requires: SUNWgtk2
-Requires: SUNWPython26
-BuildRequires: SUNWgtk2-devel
-BuildRequires: SUNWgtk-doc
+Requires: library/desktop/gtk2
+Requires: runtime/python-26
+BuildRequires: library/desktop/gtk2
+BuildRequires: developer/documentation-tool/gtk-doc
 
 %package devel		
 Summary:                 %{summary} - development files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 %include gnome-incorporation.inc
-Requires: %name
 
 %package l10n
 Summary:                 %{summary} - l10n files
-Requires:                %{name}
 
 %prep
 rm -rf %name-%version
@@ -59,7 +57,7 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod 755 $RPM_BUILD_ROOT%{_mandir}/man3/*.3
+chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man3/*.3
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
--- a/specs/SUNWgnome-img-viewer.spec	Tue Apr 17 05:57:06 2012 +0000
+++ b/specs/SUNWgnome-img-viewer.spec	Tue Apr 17 10:19:48 2012 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): eog
 #
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -35,41 +35,39 @@
 
 %include default-depend.inc
 %include desktop-incorporation.inc
-Requires: SUNWlibart
-Requires: SUNWgtk2
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-img-viewer-root
-Requires: SUNWgnome-file-mgr
-Requires: SUNWgnome-camera
-Requires: SUNWgnome-component
-Requires: SUNWgnome-config
-Requires: SUNWgnome-panel
-Requires: SUNWgnome-vfs
-Requires: SUNWjpg
-Requires: SUNWlibexif
-Requires: SUNWlibms
-Requires: SUNWlibpopt
-Requires: SUNWdesktop-cache
-Requires: SUNWlcms
-BuildRequires: SUNWgtk2-devel
-BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-panel-devel
-BuildRequires: SUNWgnome-vfs-devel
-BuildRequires: SUNWjpg-devel
-BuildRequires: SUNWlibexif-devel
-BuildRequires: SUNWlibpopt-devel
-BuildRequires: SUNWgnome-file-mgr-devel
-BuildRequires: SUNWgnome-camera-devel
-BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-icon-theme
-BuildRequires: SUNWgtk-doc
-BuildRequires: SUNWlcms
-BuildRequires: SUNWgnome-doc-utils
+Requires: image/library/libart
+Requires: library/desktop/gtk2
+Requires: library/gnome/gnome-libs
+Requires: gnome/file-manager/nautilus
+Requires: gnome/gnome-camera
+Requires: library/gnome/gnome-component
+Requires: gnome/config/gconf
+Requires: gnome/gnome-panel
+Requires: library/gnome/gnome-vfs
+Requires: image/library/libjpeg
+Requires: image/library/libexif
+Requires: system/library/math
+Requires: library/popt
+Requires: service/gnome/desktop-cache
+Requires: library/lcms
+BuildRequires: library/desktop/gtk2
+BuildRequires: library/gnome/gnome-component
+BuildRequires: gnome/config/gconf
+BuildRequires: gnome/gnome-panel
+BuildRequires: library/gnome/gnome-vfs
+BuildRequires: image/library/libjpeg
+BuildRequires: image/library/libexif
+BuildRequires: library/popt
+BuildRequires: gnome/file-manager/nautilus
+BuildRequires: gnome/gnome-camera
+BuildRequires: library/gnome/gnome-libs
+BuildRequires: gnome/theme/gnome-icon-theme
+BuildRequires: developer/documentation-tool/gtk-doc
+BuildRequires: library/lcms
+BuildRequires: developer/gnome/gnome-doc-utils
 
 %package l10n
 Summary:                 %{summary} - l10n files
-Requires:                %{name}
 
 %package root
 Summary:                 %{summary} - / filesystem
@@ -82,19 +80,18 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 %include desktop-incorporation.inc
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-img-viewer-root
-Requires: SUNWgnome-file-mgr
-Requires: SUNWgnome-camera
-Requires: SUNWgtk2
-Requires: SUNWgnome-component
-Requires: SUNWgnome-config
-Requires: SUNWgnome-panel
-Requires: SUNWgnome-vfs
-Requires: SUNWjpg
-Requires: SUNWlibexif
-Requires: SUNWlibms
-Requires: SUNWlibpopt
+Requires: library/gnome/gnome-libs
+Requires: gnome/file-manager/nautilus
+Requires: gnome/gnome-camera
+Requires: library/desktop/gtk2
+Requires: library/gnome/gnome-component
+Requires: gnome/config/gconf
+Requires: gnome/gnome-panel
+Requires: library/gnome/gnome-vfs
+Requires: image/library/libjpeg
+Requires: image/library/libexif
+Requires: system/library/math
+Requires: library/popt
 
 %prep
 rm -rf %name-%version
@@ -120,7 +117,7 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod 0755 $RPM_BUILD_ROOT%{_mandir}/man1/eog.1
+chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/eog.1
 
 install -d $RPM_BUILD_ROOT%{eog_libdir}/bonobo/servers
 
--- a/specs/SUNWgnome-keyring.spec	Tue Apr 17 05:57:06 2012 +0000
+++ b/specs/SUNWgnome-keyring.spec	Tue Apr 17 10:19:48 2012 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): gnome-keyring
 #
-# Copyright 2010 Sun Microsystems, Inc.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -25,24 +25,24 @@
 
 %include default-depend.inc
 %include desktop-incorporation.inc
-Requires: SUNWlibgcrypt
-Requires: SUNWdesktop-cache
-Requires: SUNWlibtasn1
-Requires: SUNWdbus
-Requires: SUNWglib2
-Requires: SUNWgtk2
-BuildRequires: SUNWlibgcrypt-devel
-BuildRequires: SUNWlibtasn1-devel
-BuildRequires: SUNWdbus
-BuildRequires: SUNWglib2
-BuildRequires: SUNWgtk2
+Requires: system/library/security/libgcrypt
+Requires: service/gnome/desktop-cache
+Requires: library/libtasn1
+Requires: system/library/dbus
+Requires: library/glib2
+Requires: library/desktop/gtk2
+BuildRequires: system/library/security/libgcrypt
+BuildRequires: library/libtasn1
+BuildRequires: system/library/dbus
+BuildRequires: library/glib2
+BuildRequires: library/desktop/gtk2
 
 %package root
 Summary:                 %{summary} - / filesystem
 SUNW_BaseDir:            /
 %include default-depend.inc
 %include desktop-incorporation.inc
-Requires: SUNWpostrun
+Requires: service/postrun
 
 %package devel		
 Summary:                 %{summary} - development files
@@ -52,7 +52,6 @@
 
 %package l10n
 Summary:                 %{summary} - l10n files
-Requires:                %{name}
 
 %prep
 rm -rf %name-%version
@@ -83,7 +82,7 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod 755 $RPM_BUILD_ROOT%{_mandir}/man1/*.1
+chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/*.1
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel
 rm -rf $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/standalone
--- a/specs/SUNWgnome-libs.spec	Tue Apr 17 05:57:06 2012 +0000
+++ b/specs/SUNWgnome-libs.spec	Tue Apr 17 10:19:48 2012 +0000
@@ -4,7 +4,7 @@
 # includes module(s): rarian, startup-notification, libgtkhtml,
 # 	              libgnome, libbonoboui, libgnomeui, libexif-gtk
 #
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -32,63 +32,61 @@
 
 %include default-depend.inc
 %include gnome-incorporation.inc
-Requires: SUNWlibgnomecanvas
-Requires: SUNWgnome-libs-root
-Requires: SUNWgnome-vfs
-Requires: SUNWgnome-audio
-Requires: SUNWlibexif
-Requires: SUNWlibgcrypt
-Requires: SUNWlibms
-Requires: SUNWlxml
-Requires: SUNWfreetype2
-Requires: SUNWlibpopt
-Requires: SUNWpng
-Requires: SUNWTiff
-Requires: SUNWjpg
-Requires: SUNWgnome-component
-Requires: SUNWgnome-config
-Requires: SUNWlxsl
-Requires: SUNWdesktop-cache
-Requires: SUNWlibC
-Requires: SUNWlibtasn1
-Requires: SUNWbash
-Requires: SUNWlibgnome-keyring
-Requires: SUNWhal
-BuildRequires: SUNWlibgnomecanvas-devel
-BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWgnome-vfs-devel
-BuildRequires: SUNWgnome-audio-devel
-BuildRequires: SUNWlibexif-devel
-BuildRequires: SUNWlibgcrypt-devel
-BuildRequires: SUNWlibpopt-devel
-BuildRequires: SUNWlibC
-BuildRequires: SUNWlibtasn1-devel
-BuildRequires: SUNWhal
+Requires: library/desktop/libgnomecanvas
+Requires: library/gnome/gnome-vfs
+Requires: gnome/gnome-audio
+Requires: image/library/libexif
+Requires: system/library/security/libgcrypt
+Requires: system/library/math
+Requires: library/libxml2
+Requires: system/library/freetype-2
+Requires: library/popt
+Requires: image/library/libpng
+Requires: image/library/libtiff
+Requires: image/library/libjpeg
+Requires: library/gnome/gnome-component
+Requires: gnome/config/gconf
+Requires: library/libxslt
+Requires: service/gnome/desktop-cache
+Requires: system/library/c++-runtime
+Requires: library/libtasn1
+Requires: shell/bash
+Requires: library/gnome/gnome-keyring
+Requires: service/hal
+BuildRequires: library/desktop/libgnomecanvas
+BuildRequires: gnome/config/gconf
+BuildRequires: library/gnome/gnome-component
+BuildRequires: library/gnome/gnome-vfs
+BuildRequires: gnome/gnome-audio
+BuildRequires: image/library/libexif
+BuildRequires: system/library/security/libgcrypt
+BuildRequires: library/popt
+BuildRequires: system/library/c++-runtime
+BuildRequires: library/libtasn1
+BuildRequires: service/hal
 
 %package root
 Summary:                 %{summary} - / filesystem
 SUNW_BaseDir:            /
 %include default-depend.inc
 %include gnome-incorporation.inc
-Requires: SUNWpostrun
+Requires: service/postrun
 
 %package devel		
 Summary:                 %{summary} - development files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 %include gnome-incorporation.inc
-Requires: SUNWgnome-vfs-devel
-Requires: SUNWgnome-audio-devel
+Requires: library/gnome/gnome-vfs
+Requires: gnome/gnome-audio
 BuildRequires: runtime/perl-512
-Requires: SUNWlibms
-Requires: SUNWlibgnomecanvas
-Requires: SUNWgnome-component
-Requires: SUNWlibpopt
+Requires: system/library/math
+Requires: library/desktop/libgnomecanvas
+Requires: library/gnome/gnome-component
+Requires: library/popt
 
 %package l10n
 Summary:                 %{summary} - l10n files
-Requires:                %{name}
 
 %prep
 rm -rf %name-%version
@@ -141,8 +139,8 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod 755 $RPM_BUILD_ROOT%{_mandir}/man1/*.1
-chmod 755 $RPM_BUILD_ROOT%{_mandir}/man3/*.3
+chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/*.1
+chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man3/*.3
 chmod 0644 $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/Bonobo_Sample_Controls.server
 chmod 0644 $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/GNOME_Moniker_std.server
 
--- a/specs/SUNWgnome-media-apps.spec	Tue Apr 17 05:57:06 2012 +0000
+++ b/specs/SUNWgnome-media-apps.spec	Tue Apr 17 10:19:48 2012 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): gnome-media
 #
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -26,28 +26,27 @@
 
 %include default-depend.inc
 %include gnome-incorporation.inc
-BuildRequires: SUNWbison 
-BuildRequires: SUNWPython26
-BuildRequires: SUNWlibcanberra-devel
-BuildRequires: SUNWgnome-audio-devel
-BuildRequires: SUNWgnome-cd-burner-devel
-BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-media-devel
-BuildRequires: SUNWgnome-vfs-devel
-BuildRequires: SUNWgnome-doc-utils
-Requires: SUNWlibglade
-Requires: SUNWlibcanberra
-Requires: SUNWlibms
-Requires: SUNWdesktop-cache
-Requires: SUNWgnome-cd-burner
-Requires: SUNWgnome-config
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-media
-Requires: SUNWgnome-media-apps-root
-Requires: SUNWgnome-vfs
-Requires: SUNWgnome-ui-designer
+BuildRequires: developer/parser/bison
+BuildRequires: runtime/python-26
+BuildRequires: library/desktop/xdg/libcanberra
+BuildRequires: gnome/gnome-audio
+BuildRequires: desktop/cd-burning/brasero
+BuildRequires: library/gnome/gnome-component
+BuildRequires: gnome/config/gconf
+BuildRequires: library/gnome/gnome-libs
+BuildRequires: library/audio/gstreamer
+BuildRequires: library/gnome/gnome-vfs
+BuildRequires: developer/gnome/gnome-doc-utils
+Requires: library/desktop/libglade
+Requires: library/desktop/xdg/libcanberra
+Requires: system/library/math
+Requires: service/gnome/desktop-cache
+Requires: desktop/cd-burning/brasero
+Requires: gnome/config/gconf
+Requires: library/gnome/gnome-libs
+Requires: library/audio/gstreamer
+Requires: library/gnome/gnome-vfs
+Requires: developer/ui-designer/glade
 
 %package root
 Summary:                 %{summary} - / filesystem
@@ -57,7 +56,6 @@
 
 %package l10n
 Summary:                 %{summary} - l10n files
-Requires:                %{name}
 
 %package devel
 Summary:                 %{summary} - development files
@@ -72,15 +70,13 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 %include gnome-incorporation.inc
-Requires: SUNWgnome-sound-recorder-root
-Requires: SUNWgtk2
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-audio
-Requires: SUNWgnome-config
-Requires: SUNWgnome-media
-Requires: SUNWgnome-media-apps
-Requires: SUNWgnome-vfs
-Requires: SUNWdesktop-cache
+Requires: library/desktop/gtk2
+Requires: library/gnome/gnome-libs
+Requires: gnome/gnome-audio
+Requires: gnome/config/gconf
+Requires: library/audio/gstreamer
+Requires: library/gnome/gnome-vfs
+Requires: service/gnome/desktop-cache
 
 %package -n SUNWgnome-sound-recorder-root
 Summary:                 GNOME sound recording utilities - / filesystem
@@ -115,7 +111,7 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod 755 $RPM_BUILD_ROOT%{_mandir}/man1/*.1
+chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/*.1
 
 # Remove .la and .a file as we don't ship them.
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
--- a/specs/SUNWlibtheora.spec	Tue Apr 17 05:57:06 2012 +0000
+++ b/specs/SUNWlibtheora.spec	Tue Apr 17 10:19:48 2012 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): libtheora 
 #
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -33,9 +33,9 @@
 
 %include default-depend.inc
 %include desktop-incorporation.inc
-BuildRequires: SUNWgnome-common-devel
-BuildRequires: SUNWogg-vorbis-devel
-Requires: SUNWogg-vorbis
+BuildRequires: developer/gnome/gettext
+BuildRequires: codec/ogg-vorbis
+Requires: codec/ogg-vorbis
 
 %package devel
 Summary:      %{summary} - development files
@@ -80,7 +80,7 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod 755 $RPM_BUILD_ROOT%{_mandir}/man3/*.3
+chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man3/*.3
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
--- a/specs/SUNWspeex.spec	Tue Apr 17 05:57:06 2012 +0000
+++ b/specs/SUNWspeex.spec	Tue Apr 17 10:19:48 2012 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): speex 
 #
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -35,10 +35,10 @@
                                                                                 
 %include default-depend.inc
 %include desktop-incorporation.inc
-BuildRequires: SUNWgnome-common-devel
-BuildRequires: SUNWogg-vorbis-devel
-Requires: SUNWogg-vorbis
-Requires: SUNWlibms
+BuildRequires: developer/gnome/gettext
+BuildRequires: codec/ogg-vorbis
+Requires: codec/ogg-vorbis
+Requires: system/library/math
 
 %package devel
 Summary:      %{summary} - development files
@@ -61,6 +61,7 @@
 gzcat %SOURCE0 | tar xf -
 
 %build
+export echo="/usr/bin/echo"
 %ifarch amd64 sparcv9
 export PKG_CONFIG_LIBDIR=%{_pkg_config_path64}
 %speex_64.build -d %name-%version/%_arch64
@@ -70,6 +71,7 @@
 %speex.build -d %name-%version
                                     
 %install
+export echo="/usr/bin/echo"
 %ifarch amd64 sparcv9
 %speex_64.install -d %name-%version/%_arch64
 %endif
@@ -79,7 +81,7 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod 755 $RPM_BUILD_ROOT%{_mandir}/man3/*.3
+chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man3/*.3
                                                                                 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}