Merge branch 'master' into alt-desktop

branding.spec

@@ -148,6 +148,9 @@ Summary: GNOME settings for %Brand %version %Theme
 License: Distributable
 Group: Graphical desktop/KDE
 Requires: gtk2-theme-mist
+Provides: gnome-theme-%brand-%theme = %version-%release
+Provides: metacity-theme-%brand-%theme = %version-%release
+Provides: metacity-theme
 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde3-settings ";done )
 
 %description gnome-settings
@@ -256,13 +259,14 @@ install -m 644 *.rc "%buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/"
 popd
 
 #gnome-settings
+%define XdgThemeName "%Brand %Theme'
 pushd gnome-settings
-mkdir -p %buildroot/%_datadir/themes/theme-%brand-%theme
-mkdir -p %buildroot/%_datadir/themes/theme-%brand-%theme/gtk-2.0
-install -m 644 gtkrc %buildroot/%_datadir/themes/theme-%brand-%theme/gtk-2.0
-mkdir -p %buildroot/%_datadir/themes/theme-%brand-%theme/metacity-1
-install -m 644 metacity-theme-1.xml %buildroot/%_datadir/themes/theme-%brand-%theme/metacity-1/
-install -m 644 index.theme %buildroot/%_datadir/themes/theme-%brand-%theme/
+mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName'
+mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
+install -m 644 gtkrc '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
+mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1'
+install -m 644 metacity-theme-1.xml '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1/'
+install -m 644 index.theme '%buildroot/%_datadir/themes/%XdgThemeName/'
 popd
 
 #slideshow
@@ -343,10 +347,10 @@ echo $lang > lang
 %files kde3-settings
 %_sysconfdir/skel/Desktop
 %_sysconfdir/skel/.kde
-%_datadir/apps/ksplash/Themes/ALTLinux%Theme/*
+%_datadir/apps/ksplash/Themes/*
 
 %files gnome-settings
-%_datadir/themes/theme-%brand-%theme/*
+%_datadir/themes/*
 
 %files slideshow
 /usr/share/install2/slideshow

configure.ac

@@ -16,6 +16,7 @@ DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
 
 AC_SUBST(THEME)
 AC_SUBST(NAME)
+AC_SUBST(BRAND)
 AC_SUBST(BRAND_FNAME)
 AC_SUBST(STATUS)
 AC_SUBST(STATUS_EN)

gnome-settings/index.theme.in

 [X-GNOME-Metatheme]
-Name=@BRAND@-@THEME@
+Name=@BRAND_FNAME@ @NAME@
 Type=X-GNOME-Metatheme
 Comment=Theme for @BRAND_FNAME@ @NAME@
 Encoding=UTF-8
 GtkTheme=@BRAND_FNAME@ @NAME@
-MetacityTheme=@BRAND@-@THEME@
+MetacityTheme=@BRAND_FNAME@ @NAME@
 IconTheme=Mist

gnome-settings/metacity-theme-1.xml.in

@@ -2,11 +2,11 @@
 <!-- 	$Id$	 -->
 <metacity_theme>
 <info>
-  <name>@BRAND@-@THEME@</name>
+  <name>@BRAND_FNAME@ @NAME@</name>
   <author>Dave Camp &lt;dave@ximian.com&gt;</author>
   <copyright>&#194; 2002 Ximian, Inc. </copyright>
   <date>Sep, 2002</date>
-  <description>A dumb metacity theme, similar to tigertcrack but not</description>
+  <description>The Mist theme</description>
 </info>
  
 <frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">