some cosmetic changesV2_0_1_1mdk

5 files changed, 29 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 2ad9a39..4990729 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ VERSION := $(shell sed -n 's/%define version //p' < $(NAME).spec)
 RELEASE := $(shell sed -n 's/%define release //p' < $(NAME).spec)
 RELTAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
 
-SUBDIRS=scripts fb fbmngplay fbtruetype splash
+SUBDIRS=scripts fb fbmngplay fbtruetype splash po
 DATADIRS=themes/data/
 CONFIGDIRS=themes/config/
 THEMES=Mandrake
@@ -22,7 +22,7 @@ install:
 	@for i in $(SUBDIRS);do	make -C $$i install;done
 	@for i in $(DATADIRS);do for t in $(THEMES); do cp -a $$i/$$t $(prefix)$(sharedir)/bootsplash/themes/;done; done
 	@for i in $(CONFIGDIRS);do for t in $(THEMES); do install -d $(prefix)/$(configdir)/bootsplash/themes/$$t/config; cp -a $(CONFIGDIRS)/$$t/cfg/* $(prefix)$(configdir)/bootsplash/themes/$$t/config/;done ;done
-	@for d in 800x600 1024x768; do for v in 1 2 3; do ln -s vt1-$$d.cfg $(prefix)$(configdir)/bootsplash/themes/Mandrake/config/vt$$v-$$d.cfg; done; done
+	@for d in 800x600 1024x768; do for v in 1 2 3; do ln -s vt0-$$d.cfg $(prefix)$(configdir)/bootsplash/themes/Mandrake/config/vt$$v-$$d.cfg; done; done
 
 dis: clean 
 	rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
diff --git a/bootsplash.spec b/bootsplash.spec
index fde7d3c..69b720e 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -1,6 +1,6 @@
 %define name bootsplash
-%define version 2.0.0
-%define release 2mdk
+%define version 2.0.1
+%define release 1mdk
 %define _bootdir /boot
 
 Summary: The Boot Splash Images and scripts
@@ -48,6 +48,8 @@ done
 #find $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/ $RPM_BUILD_ROOT/%_datadir/%{name}/ -not -path "*/themes/Mandrake/*" -not -path "*/scripts/*" -type f |
 #  sed -e "s#^$RPM_BUILD_ROOT##g" > rpm-themes-files
 
+%find_lang bootsplash
+
 %post
 cd %{_bootdir} 
     if [[ -x /usr/share/loader/make-initrd ]]; then 
@@ -63,6 +65,17 @@ cd %{_bootdir}
         fi 
     fi 
 
+# Add right translation file
+for i in `echo $LANGUAGE:$LC_ALL:$LC_COLLATE:$LANG:C | tr ':' ' '`
+do      
+        if [ -r %{_datadir}/locale/$i/LC_MESSAGES/bootsplash.mo ]; then
+                mkdir -p /etc/locale/$i/LC_MESSAGES/
+                cp %{_datadir}/locale/$i/LC_MESSAGES/bootsplash.mo \
+                        /etc/locale/$i/LC_MESSAGES/
+                break
+        fi
+done
+    
 %postun
 cd %{_bootdir} 
     if [[ -x /usr/share/loader/make-initrd ]]; then 
@@ -81,8 +94,7 @@ cd %{_bootdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
-%files
+%files -f %name.lang
 %defattr(-,root,root)
 %doc README ChangeLog fbmngplay/ChangeLog.fbmngplay fbmngplay/README.fbmngplay fbtruetype/ChangeLog.fbtruetype fbtruetype/README.fbtruetype
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -94,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Fri Aug 01 2003 Warly <warly@mandrakesoft.com> 2.0.1-1mdk
+- first vt is 0 and not 1 for bootsplash
+- add locale
+
 * Thu Jul 31 2003 Warly <warly@mandrakesoft.com> 2.0.0-2mdk
 - some images paths where wrong
 
diff --git a/themes/config/Mandrake/cfg/bootsplash-800x600.cfg b/themes/config/Mandrake/cfg/bootsplash-800x600.cfg
index 5040097..346bc5a 100644
--- a/themes/config/Mandrake/cfg/bootsplash-800x600.cfg
+++ b/themes/config/Mandrake/cfg/bootsplash-800x600.cfg
@@ -23,7 +23,7 @@ th=472
 # ttf message output parameters
 text_x=20
 text_y=20
-text_size=20
+text_size=16
 text_color=0xeef4ff
 
 # name of the picture file (full path recommended)
@@ -33,14 +33,14 @@ silentjpeg=/usr/share//bootsplash/themes/Mandrake/images/silent-800x600.jpg
 progress_enable=1
 
 # background
-box silent noover 400 553 790 577 #04045498
-box silent inter 400 554 400 576 #99ccff #99ccff #324bb0 #526bb0
-box silent       400 554 790 576 #99ccff #99ccff #324bb0 #526bb0
+box silent noover 400 563 790 577 #04045498
+box silent inter 400 564 400 576 #99ccff #99ccff #324bb0 #526bb0
+box silent       400 564 790 576 #99ccff #99ccff #324bb0 #526bb0
 # black border
-box silent         400 553 790 553 #313234
+box silent         400 563 790 563 #313234
 box silent         400 577 790 577 #eef4ff
-box silent         400 553 400 577 #313234
-box silent         790 553 790 577 #eef4ff
+box silent         400 563 400 577 #313234
+box silent         790 563 790 577 #eef4ff
 
 # text box (left, top)
 box     27 91  27 569 #313234
diff --git a/themes/config/Mandrake/cfg/vt1-1024x768.cfg b/themes/config/Mandrake/cfg/vt0-1024x768.cfg
index 1869964..1869964 100644
--- a/themes/config/Mandrake/cfg/vt1-1024x768.cfg
+++ b/themes/config/Mandrake/cfg/vt0-1024x768.cfg
diff --git a/themes/config/Mandrake/cfg/vt1-800x600.cfg b/themes/config/Mandrake/cfg/vt0-800x600.cfg
index f8c5938..f8c5938 100644
--- a/themes/config/Mandrake/cfg/vt1-800x600.cfg
+++ b/themes/config/Mandrake/cfg/vt0-800x600.cfg