added support for --with-openindiana-branding s11express-2010-11
authorGuido Berhoerster <guido+openindiana@berhoerster.name>
Tue, 07 Sep 2010 17:55:43 +0200
branchs11express-2010-11
changeset 22068 0f285a67d627
parent 21691 eb1695f62120
child 22069 af54b3ee55b3
added support for --with-openindiana-branding
include/options.inc
include/prod.inc
--- a/include/options.inc	Mon Apr 11 04:59:18 2011 +0000
+++ b/include/options.inc	Tue Sep 07 17:55:43 2010 +0200
@@ -96,10 +96,28 @@
 %define option_with_indiana_branding %{?_with_indiana_branding:1}%{?!_with_indiana_branding:0}
 %define option_without_indiana_branding %{!?_with_indiana_branding:1}%{?_with_indiana_branding:0}
 
+#
+# Option: --with-openindiana-branding
+#
+# use --with-openindiana-branding to build JDS with OpenIndiana branding
+# default: no OpenIndiana branding
+#
+%define option_with_openindiana_branding %{?_with_openindiana_branding:1}%{?!_with_openindiana_branding:0}
+%define option_without_openindiana_branding %{!?_with_openindiana_branding:1}%{?_with_openindiana_branding:0}
+
 %if %option_with_sun_branding
 %if %option_with_indiana_branding
 %error You cannot enable both Sun Solaris and Indiana branding
 %endif
+%if %option_with_openindiana_branding
+%error You cannot enable both Sun Solaris and OpenIndiana branding
+%endif
+%endif
+
+%if %option_with_indiana_branding
+%if %option_with_openindiana_branding
+%error You cannot enable both Indiana and OpenIndiana branding
+%endif
 %endif
 
 #
--- a/include/prod.inc	Mon Apr 11 04:59:18 2011 +0000
+++ b/include/prod.inc	Tue Sep 07 17:55:43 2010 +0200
@@ -11,7 +11,7 @@
 
 %{?sf_download:#}%define sf_download http://downloads.sourceforge.net
 
-%{?jds_version:#}%define jds_version JDSosol
+%{?jds_version:#}%define jds_version JDSoi
 %define default_category   GNOME2,application,%{jds_version}
 %{?support_level:#}%define support_level      unsupported