diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-09-15 20:20:46 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-09-15 20:20:46 +0000 |
| commit | 7a7ace77759e4803951b12cfe45083b12e6c8826 (patch) | |
| tree | 3d2bf5413d108ca941950075dedab33029cee176 | |
| parent | 7dc10c1b5462c434bb976fded298e82bcf71c0c5 (diff) | |
| download | bootsplash-7a7ace77759e4803951b12cfe45083b12e6c8826.tar bootsplash-7a7ace77759e4803951b12cfe45083b12e6c8826.tar.gz bootsplash-7a7ace77759e4803951b12cfe45083b12e6c8826.tar.bz2 bootsplash-7a7ace77759e4803951b12cfe45083b12e6c8826.tar.xz bootsplash-7a7ace77759e4803951b12cfe45083b12e6c8826.zip | |
fix upgrading mandrakelinux-theme to mandriva-theme by patching remove-theme
("remove-theme Mandrakelinux" from the preun of mandrakelinux-theme
will be called after the switch-theme from the post of mandriva-theme)
this also implies mandriva-theme prereq this bootsplash
nb: this whole mess is caused by preun of mandrakelinux-theme being called with "$1" = 0
because of the package name change
| -rw-r--r-- | bootsplash.spec | 8 | ||||
| -rw-r--r-- | scripts/remove-theme | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/bootsplash.spec b/bootsplash.spec index 88d1547..482e2d6 100644 --- a/bootsplash.spec +++ b/bootsplash.spec @@ -1,6 +1,6 @@ %define name bootsplash %define version 3.1.8 -%define release %mkrel 2 +%define release %mkrel 3 %define _bootdir /boot Summary: The Boot Splash Images and scripts @@ -87,6 +87,12 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* Thu Sep 15 2005 Pixel <pixel@mandriva.com> 3.1.8-3mdk +- fix upgrading mandrakelinux-theme to mandriva-theme by patching remove-theme + ("remove-theme Mandrakelinux" from the preun of mandrakelinux-theme + will be called after the switch-theme from the post of mandriva-theme) + this also implies mandriva-theme prereq this bootsplash + * Thu Aug 11 2005 Nicolas Lécureuil <neoclust@mandriva.org> 3.1.8-2mdk - fix url - s/Mandrakelinux/Mandriva Linux/ diff --git a/scripts/remove-theme b/scripts/remove-theme index 9263b1b..728c810 100644 --- a/scripts/remove-theme +++ b/scripts/remove-theme @@ -36,5 +36,11 @@ function update_boot () { fi } +if [ "$1" = Mandrakelinux ]; then + # in case we are upgrading mandrakelinux-theme to mandriva-theme + # "remove-theme Mandrakelinux" will be called thinking there is no theme anymore + grep -qi "THEME=Mandriva" $sysconfig && exit 0 +fi + remove_theme update_boot |