diff --git a/gfxboot.changes b/gfxboot.changes index 33c7df6..a151c78 100644 --- a/gfxboot.changes +++ b/gfxboot.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 21 14:01:32 UTC 2011 - coolo@suse.com + +- do not package the openSUSE theme here, but leave it up for + branding-openSUSE +- remove the fdupes again, way too dangerous in this + ------------------------------------------------------------------- Mon Sep 12 12:18:12 UTC 2011 - toddrme2178@gmail.com diff --git a/gfxboot.spec b/gfxboot.spec index 4d3f5e9..d7eac25 100644 --- a/gfxboot.spec +++ b/gfxboot.spec @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: gfxboot Version: 4.4.5 Release: 1 @@ -75,20 +77,6 @@ Conflicts: otherproviders(%{name}-branding) %description branding-upstream upstream theme for gfxboot (bootloader graphics). -%package branding-openSUSE -Summary: Graphical bootloader openSUSE theme -Group: System/Boot -PreReq: %{name} >= 4 -Supplements: packageand(%{name}:branding-openSUSE) -Provides: %{name}-theme = %{version} -Provides: %{name}-branding = %{version} -Obsoletes: bootloader-theme-SUSELinux-Prof < %{version} -Provides: bootloader-theme-SUSELinux-Prof = %{version} -Conflicts: otherproviders(%{name}-branding) - -%description branding-openSUSE -openSUSE theme for gfxboot (bootloader graphics). - %package branding-SLES Summary: Graphical bootloader SLES theme Group: System/Boot @@ -148,19 +136,16 @@ make themes %install %make_install +rm -rf %{buildroot}/etc/bootsplash/themes/openSUSE/ gzip -9c doc/%{name}.8 >%{name}.8.gz install -d -m 755 %{buildroot}%{_mandir}/man8 install -m 644 %{name}.8.gz %{buildroot}%{_mandir}/man8 mkdir %{buildroot}/boot touch %{buildroot}/boot/message -%fdupes -s %{buildroot}%{_datadir}/%{name}/themes/ %post branding-upstream %{name} --update-theme upstream -%post branding-openSUSE -%{name} --update-theme openSUSE - %post branding-SLES %{name} --update-theme SLES @@ -170,9 +155,6 @@ touch %{buildroot}/boot/message %post branding-KDE %{name} --update-theme KDE -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %{_sbindir}/%{name} @@ -194,11 +176,6 @@ rm -rf %{buildroot} %{_sysconfdir}/bootsplash/themes/upstream %ghost /boot/message -%files branding-openSUSE -%defattr(-,root,root) -%{_sysconfdir}/bootsplash/themes/openSUSE -%ghost /boot/message - %files branding-SLES %defattr(-,root,root) %{_sysconfdir}/bootsplash/themes/SLES