<<<<<<< HEAD:branding.spec

branding.spec

@@ -108,7 +108,7 @@ make
 
 #bootloader
     pushd design-bootloader-source/
-    DEFAULT_LANG=ru PATH=$PATH:/usr/sbin %make
+    DEFAULT_LANG='--lang-to-subst--' PATH=$PATH:/usr/sbin %make
     popd
 
 #browser-qt
@@ -170,6 +170,12 @@ popd
 
 %post bootloader
 %__ln_s -nf %theme/message /boot/splash/message
+. /etc/sysconfig/i18n
+lang=$(echo $LANG | cut -d. -f 1)
+cd boot/splash/%theme/
+echo $lang > lang
+echo lang | cpio -o --append -F message
+
 
 
 %preun bootloader
@@ -208,10 +214,37 @@ popd
 
 
 %changelog
+<<<<<<< HEAD:branding.spec
 * Tue Feb 17 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt7
 - merge with desktop branch
 - unneded subpackages deleted
 
+* Mon Feb 16 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt13
+- rebuild for fix oversized /boot/splash/message 
+
+* Fri Feb 13 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt12
+- default language set to ru_RU for system boot 
+
+* Wed Feb 11 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt11
+- fixed conflict of notes subpackage with itself 
+
+* Tue Feb 10 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt10
+- more kde4 settings from zerg@ 
+- alternative and obsoletes for graphics added
+
+* Thu Feb 05 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt9
+- rebuild with new translations 
+
+* Thu Feb 05 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt8
+- added kde4-settings subpackage 
+
+* Wed Feb 04 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt7
+- added conflicts for notes 
+
+* Mon Jan 26 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt6
+- xdm background fixed 
+>>>>>>> alt-desktop:branding.spec
+
 * Fri Jan 23 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt5
 - added 'notes' subpackage