# HG changeset patch
# User davelam
# Date 1291791968 0
# Node ID e596097518220cae362458492fc8b8b08d933974
# Parent  1d5d9e7c5a6e67fe33fe606f2ebf3b8c6cfe4437
2010-12-08  Dave Lin <dave.lin@oracle.com>

        * include/gnome-consolidation.inc
        * include/options.inc: Add option "--with-svr4" to make build based
          on SVR4 packaging mechanism.
        * include/l10n-consolidation.inc: Added(empty).

        * specs/SUNWgnome-display-mgr.spec: Removed duplicated line in %files.
        * specs/SUNWccsm.spec: Corrected dependency package name.
        * specs/SUNWevolution-libs.spec: Corrected dependency package name.

diff -r 1d5d9e7c5a6e -r e59609751822 ChangeLog
--- a/ChangeLog	Tue Dec 07 21:56:58 2010 +0000
+++ b/ChangeLog	Wed Dec 08 07:06:08 2010 +0000
@@ -1,3 +1,14 @@
+2010-12-08  Dave Lin <dave.lin@oracle.com>
+
+	* include/gnome-consolidation.inc
+	* include/options.inc: Add option "--with-svr4" to make build based
+	  on SVR4 packaging mechanism.
+	* include/l10n-consolidation.inc: Added(empty).
+
+	* specs/SUNWgnome-display-mgr.spec: Removed duplicated line in %files.
+	* specs/SUNWccsm.spec: Corrected dependency package name.
+	* specs/SUNWevolution-libs.spec: Corrected dependency package name. 
+
 2010-12-07  Brian Cameron  <brian.cameron@oracle.com>
 
 	* base-specs/vte.spec: Correct setting of PYTHON.
diff -r 1d5d9e7c5a6e -r e59609751822 include/gnome-consolidation.inc
--- a/include/gnome-consolidation.inc	Tue Dec 07 21:56:58 2010 +0000
+++ b/include/gnome-consolidation.inc	Wed Dec 08 07:06:08 2010 +0000
@@ -7,7 +7,10 @@
 Meta(org.opensolaris.consolidation): gnome
 Meta(variant.opensolaris.zone): global,nonglobal
 
+%if %option_with_svr4
+%else
 Requires: consolidation/gnome/gnome-incorporation = *
+%endif
 
 # ChangeLog:
 # 2010-06-10  Michal Pryc <Michal.Pryc@Oracle.Com>
diff -r 1d5d9e7c5a6e -r e59609751822 include/l10n-consolidation.inc
diff -r 1d5d9e7c5a6e -r e59609751822 include/options.inc
--- a/include/options.inc	Tue Dec 07 21:56:58 2010 +0000
+++ b/include/options.inc	Wed Dec 08 07:06:08 2010 +0000
@@ -134,6 +134,13 @@
 # default: build lightning
 %define option_with_lightning %{?!_without_lightning:1}%{?_without_lightning:0}
 
+#
+# Option: --with-svr4
+#
+# use --with-svr4 to build based on SVr4 packaging mechanism
+# default: build based on pkg(5) packaging mechanism
+%define option_with_svr4 %{?_with_svr4:1}%{?!_with_svr4:0}
+
 # ChangeLog:
 # 2009-05-25  - ginn.chen@sun.com
 # - add option --without-lightning
diff -r 1d5d9e7c5a6e -r e59609751822 specs/SUNWccsm.spec
--- a/specs/SUNWccsm.spec	Tue Dec 07 21:56:58 2010 +0000
+++ b/specs/SUNWccsm.spec	Wed Dec 08 07:06:08 2010 +0000
@@ -41,7 +41,7 @@
 BuildRequires:  SUNWgnome-python26-libs-devel
 BuildRequires:  SUNWPython26
 BuildRequires:  SUNWpython26-setuptools
-BuildRequires:  SUNWcompizconfig-python26
+BuildRequires:  SUNWcompizconfig-python
 BuildRequires:  SUNWlibsexy
 Requires:       SUNWdbus-python26
 Requires:       SUNWgnome-python26-libs
diff -r 1d5d9e7c5a6e -r e59609751822 specs/SUNWevolution-libs.spec
--- a/specs/SUNWevolution-libs.spec	Tue Dec 07 21:56:58 2010 +0000
+++ b/specs/SUNWevolution-libs.spec	Wed Dec 08 07:06:08 2010 +0000
@@ -50,7 +50,7 @@
 BuildRequires: SUNWiso-codes-devel
 BuildRequires: SUNWgnome-icon-theme
 BuildRequires: SUNWhea
-BuildRequires: SUNWicrud
+BuildRequires: SUNWicud
 BuildRequires: SUNWpcre
 
 %if %build_l10n
diff -r 1d5d9e7c5a6e -r e59609751822 specs/SUNWgnome-display-mgr.spec
--- a/specs/SUNWgnome-display-mgr.spec	Tue Dec 07 21:56:58 2010 +0000
+++ b/specs/SUNWgnome-display-mgr.spec	Wed Dec 08 07:06:08 2010 +0000
@@ -241,7 +241,6 @@
 %dir %attr (0755, root, sys) /lib/svc/manifest/application/graphical-login
 %attr (0555, root, bin) /lib/svc/method/svc-gdm
 %attr (0444, root, sys) /lib/svc/manifest/application/graphical-login/gdm.xml
-%ips_tag(restart_fmri="svc:/system/manifest-import:default") %attr (0444, root, sys) /lib/svc/manifest/application/graphical-login/gdm.xml
 %dir %attr (0755, root, bin) %{_localstatedir}/cache
 %dir %attr (0755, root, gdm) %{_localstatedir}/cache/gdm
 %dir %attr (0755, root, other) %{_localstatedir}/lib