readd Ayo in a separate packageV1_3_7_1mdk

13 files changed, 82 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 73bf497..ed1a3b0 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,6 @@ install:
 	@for i in $(SUBDIRS);do	make -C $$i install;done
 	@for i in $(DATADIRS);do cp -a $$i/* $(prefix)$(sharedir)/bootsplash/themes/;done
 	@for i in $(CONFIGDIRS);do cp -a $$i/* $(prefix)$(configdir)/bootsplash/themes/;done
-	rm -fr $(prefix)$(configdir)/bootsplash/themes/Ayo
-	rm -fr $(prefix)$(sharedir)/bootsplash/themes/Ayo
 
 dis: clean 
 	rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
diff --git a/bootsplash.spec b/bootsplash.spec
index c0b9125..19ac46f 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -1,12 +1,7 @@
 %define name bootsplash
-<<<<<<< bootsplash.spec
 %define version 1.3.7
 %define release 1mdk
 %define _bootdir /boot
-=======
-%define version 1.3.6
-%define release 2mdk
->>>>>>> 1.24
 
 Summary: The Boot Splash Images and scripts
 Name: %{name}
@@ -33,6 +28,15 @@ This package contains the scripts and pictures visible when booting a
 Mandrake kernel.  They are automatically installed when an initrd is
 generated by mkinitrd.
 
+%package themes
+
+Summary: bootsplash themes
+Group: System/Kernel and hardware
+Requires: bootsplash
+
+%description themes
+Additional themes for bootsplash
+
 %prep
 %setup -q
 
@@ -47,6 +51,9 @@ cd ..
 rm -rf $RPM_BUILD_ROOT
 make install prefix=$RPM_BUILD_ROOT
 
+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
+
 %post
 cd %{_bootdir} 
     if [[ -x /usr/share/loader/make-initrd ]]; then 
@@ -85,15 +92,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc README ChangeLog
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%_datadir/%{name}/*
-%config(noreplace) %_sysconfdir/%{name}/*
+%_datadir/%{name}/scripts
+%_datadir/%{name}/themes/Mandrake
+%config(noreplace) %_sysconfdir/%{name}/themes/Mandrake/*
 /bin/*
 
+%files themes -f rpm-themes-files
+%defattr(-,root,root)
+
 %changelog
 * Thu Mar 07 2002 Warly <warly@mandrakesoft.com> 1.3.7-1mdk
 - obsolete Aurora
 - new images
 - update initrd (or try to)
+- readd Ayo themes in separate packages
 
 * Wed Mar 06 2002 David BAUDENS <baudens@mandrakesoft.com> 1.3.6-2mdk
 - Remove non Mandrake's theme
diff --git a/themes/Mandrake/images/bootsplash-1024x768.jpg b/themes/Mandrake/images/bootsplash-1024x768.jpg
index 307100a..c57ad5b 100644
--- a/themes/Mandrake/images/bootsplash-1024x768.jpg
+++ b/themes/Mandrake/images/bootsplash-1024x768.jpg
diff --git a/themes/Mandrake/images/bootsplash-1280x1024.jpg b/themes/Mandrake/images/bootsplash-1280x1024.jpg
index f80fdfd..fa2871c 100644
--- a/themes/Mandrake/images/bootsplash-1280x1024.jpg
+++ b/themes/Mandrake/images/bootsplash-1280x1024.jpg
diff --git a/themes/Mandrake/images/bootsplash-800x600.jpg b/themes/Mandrake/images/bootsplash-800x600.jpg
index 4f057ae..768d240 100644
--- a/themes/Mandrake/images/bootsplash-800x600.jpg
+++ b/themes/Mandrake/images/bootsplash-800x600.jpg
diff --git a/themes/config/Ayo/cfg/bootsplash-1024x768.cfg b/themes/config/Ayo/cfg/bootsplash-1024x768.cfg
new file mode 100644
index 0000000..2405746
--- /dev/null
+++ b/themes/config/Ayo/cfg/bootsplash-1024x768.cfg
@@ -0,0 +1,20 @@
+# This is the configuration file for the 1024x768 bootsplash picture
+# This file is necessary to specify the coordinates of the text box on the
+# splash screen.
+#
+# Comments are welcome by stepan@suse.de
+
+# tx is the x coordinate of the text window in characters. default is 19
+# multiply width font width for coordinate in pixels.
+tx=7
+
+# ty is the y coordinate of the text window in characters. default is 10
+ty=4
+
+# tw is the width of the text window in characters. default is 104
+# NOTE: this should at least be 80 as on the standard linux text console
+tw=122
+
+# th is the height of the text window in characters. default is 34
+# NOTE: this should at least be 25 as on the standard linux text console
+th=41
diff --git a/themes/config/Ayo/cfg/bootsplash-1280x1024.cfg b/themes/config/Ayo/cfg/bootsplash-1280x1024.cfg
new file mode 100644
index 0000000..6b3c031
--- /dev/null
+++ b/themes/config/Ayo/cfg/bootsplash-1280x1024.cfg
@@ -0,0 +1,19 @@
+# This is the configuration file for the 1280x1024 bootsplash picture                                                                      
+# This file is necessary to specify the coordinates of the text box on the
+# splash screen.
+
+# tx is the x coordinate of the text window in characters. default is 24
+# multiply width font width for coordinate in pixels.
+tx=9
+
+# ty is the y coordinate of the text window in characters. default is 14
+ty=6
+
+# tw is the width of the text window in characters. default is 130
+# NOTE: this should at least be 80 as on the standard linux text console
+tw=145
+
+# th is the height of the text window in characters. default is 44
+# NOTE: this should at least be 25 as on the standard linux text console
+th=53
+
diff --git a/themes/config/Ayo/cfg/bootsplash-800x600.cfg b/themes/config/Ayo/cfg/bootsplash-800x600.cfg
new file mode 100644
index 0000000..8f6b024
--- /dev/null
+++ b/themes/config/Ayo/cfg/bootsplash-800x600.cfg
@@ -0,0 +1,19 @@
+# This is the configuration file for the 800x600 bootsplash picture.
+# This file is necessary to specify the coordinates of the text box on the
+# splash screen.
+
+# tx is the x coordinate of the text window in characters. default is 15
+# multiply width font width for coordinate in pixels.
+tx=7
+
+# ty is the y coordinate of the text window in characters. default is 8
+ty=4
+
+# tw is the width of the text window in characters. default is 82
+# NOTE: this should at least be 80 as on the standard linux text console
+tw=82
+
+# th is the height of the text window in characters. default is 26
+# NOTE: this should at least be 25 as on the standard linux text console
+th=30
+
diff --git a/themes/config/Ayo/global.config b/themes/config/Ayo/global.config
new file mode 100644
index 0000000..4efccc5
--- /dev/null
+++ b/themes/config/Ayo/global.config
@@ -0,0 +1,5 @@
+# See definitions on /etc/sysconfig/bootsplash
+LOGO_CONSOLE=yes
+
+# Quiet or not ?
+QUIET=no
diff --git a/themes/data/Ayo/images/bootsplash-1024x768.jpg b/themes/data/Ayo/images/bootsplash-1024x768.jpg
new file mode 100644
index 0000000..589be5b
--- /dev/null
+++ b/themes/data/Ayo/images/bootsplash-1024x768.jpg
diff --git a/themes/data/Ayo/images/bootsplash-1280x1024.jpg b/themes/data/Ayo/images/bootsplash-1280x1024.jpg
new file mode 100644
index 0000000..aba3e9b
--- /dev/null
+++ b/themes/data/Ayo/images/bootsplash-1280x1024.jpg
diff --git a/themes/data/Ayo/images/bootsplash-800x600.jpg b/themes/data/Ayo/images/bootsplash-800x600.jpg
new file mode 100644
index 0000000..1d1a64c
--- /dev/null
+++ b/themes/data/Ayo/images/bootsplash-800x600.jpg
diff --git a/themes/data/Ayo/lilo/message b/themes/data/Ayo/lilo/message
new file mode 100644
index 0000000..9be93bc
--- /dev/null
+++ b/themes/data/Ayo/lilo/message