From 478da872cb9728823f43db0c70e01991f27e5621 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Thu, 7 Mar 2002 22:42:50 +0000
Subject: readd Ayo in a separate package

---
 bootsplash.spec | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'bootsplash.spec')

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
-- 
cgit v1.2.1