From fa81ac50dd6613ff9c55d2169538a062a417e89d Mon Sep 17 00:00:00 2001
From: Andras Timar <atimar@suse.com>
Date: Fri, 14 Sep 2012 22:43:43 +0200
Subject: remove DONTSHOWINUSERINSTALL style, because it is not interpreted

Change-Id: I146e29a68b04ce227fd2b9568fd2bbcd79b45792
---
 scp2/source/gnome/module_gnome.scp               | 4 ----
 scp2/source/kde/module_kde.scp                   | 2 +-
 scp2/source/onlineupdate/module_onlineupdate.scp | 2 +-
 scp2/source/ooo/module_systemint.scp             | 2 +-
 scp2/source/stdlibs/module_stdlibs.scp           | 4 ----
 scp2/source/tde/module_tde.scp                   | 2 +-
 6 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'scp2')

diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 9194825a1113..80ec3f7a2143 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -32,11 +32,7 @@ Module gid_Module_Optional_Gnome
     Default = YES;
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
-#ifdef UNX
     Styles = ();
-#else
-    Styles = (DONTSHOWINUSERINSTALL);
-#endif
 #ifdef ENABLE_GNOMEVFS
     XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 55180c57bad8..f1bc11caa0f6 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -33,7 +33,7 @@ Module gid_Module_Optional_Kde
     Default = YES;
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
-    Styles = (DONTSHOWINUSERINSTALL);
+    Styles = ();
     Files = (
 #ifdef ENABLE_KDE
     gid_File_Lib_Kdebe
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
index b33235b78e4a..29da63585272 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -33,7 +33,7 @@ Module gid_Module_Optional_Onlineupdate
     Sortkey = "800";
     ParentID = gid_Module_Optional;
     Default = YES;
-    Styles = (DONTSHOWINUSERINSTALL);
+    Styles = ();
     Files = (gid_File_Bin_UnpackUpdate,
              gid_File_Lib_Updchk,
              gid_File_Lib_Updchkui,
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
index 12ccef46c805..bb628f6806f0 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -38,7 +38,7 @@ Module gid_Module_Optional_Systemintegration
   #ifdef WNT
     Styles = (HIDDEN_ROOT);
   #else
-    Styles = (SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
+    Styles = (SYSTEMMODULE,NOTRELOCATABLE,INSTALLCANFAIL,USEFORCE);
   #endif
   #if (defined(LINUX)) || (defined(SOLARIS))
     PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
diff --git a/scp2/source/stdlibs/module_stdlibs.scp b/scp2/source/stdlibs/module_stdlibs.scp
index f938f85914b1..537e392e0eb2 100644
--- a/scp2/source/stdlibs/module_stdlibs.scp
+++ b/scp2/source/stdlibs/module_stdlibs.scp
@@ -32,11 +32,7 @@ Module gid_Module_Optional_Stdlibs
     Default = NO;
     PackageInfo = "packinfo_ure.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_STDLIBS);
-#ifdef UNX
     Styles = ();
-#else
-    Styles = (DONTSHOWINUSERINSTALL);
-#endif
     Files = (
 #if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index dcdd867cf3e8..e302c5496a32 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -30,7 +30,7 @@ Module gid_Module_Optional_Tde
     Default = YES;
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
-    Styles = (DONTSHOWINUSERINSTALL);
+    Styles = ();
     Files = (
 #ifdef ENABLE_TDE
     gid_File_Lib_Tdebe
-- 
cgit