aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2004-09-08 04:09:43 +0000
committerFlorent Villard <warly@mandriva.com>2004-09-08 04:09:43 +0000
commit8cf968b7d7d7fa29c7f84a9b3602ae791fde0f3d (patch)
tree44388a5df2a70bda8b4e994d4d35786e9702d30a
parent8b2455ee8c912ab76097084f91f84323c61c2f2e (diff)
downloadbootsplash-8cf968b7d7d7fa29c7f84a9b3602ae791fde0f3d.tar
bootsplash-8cf968b7d7d7fa29c7f84a9b3602ae791fde0f3d.tar.gz
bootsplash-8cf968b7d7d7fa29c7f84a9b3602ae791fde0f3d.tar.bz2
bootsplash-8cf968b7d7d7fa29c7f84a9b3602ae791fde0f3d.tar.xz
bootsplash-8cf968b7d7d7fa29c7f84a9b3602ae791fde0f3d.zip
remove-theme does not require an argument anymore
-rw-r--r--bootsplash.spec8
-rw-r--r--fbmngplay/Makefile2
-rw-r--r--scripts/remove-theme21
3 files changed, 9 insertions, 22 deletions
diff --git a/bootsplash.spec b/bootsplash.spec
index 0ed6bd0..3ab1884 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -1,5 +1,5 @@
%define name bootsplash
-%define version 2.1.11
+%define version 2.1.12
%define release 1mdk
%define _bootdir /boot
@@ -20,7 +20,7 @@ Requires: mkinitrd >= 3.5.18-14mdk
Requires: kernel initscripts > 7.04-15mdk
Conflicts: drakxtools-newt < 10-49mdk
Obsoletes: Aurora Aurora-Monitor-NewStyle-Categorizing-WsLib Aurora-Monitor-NewStyle-WsLib Aurora-Monitor-Traditional-Gtk+ Aurora-Monitor-Traditional-WsLib-8.2
-BuildRequires: freetype2-static-devel libmng-static-devel libjpeg-static-devel glibc-static-devel
+BuildRequires: freetype2-static-devel libmng-static-devel libjpeg-static-devel glibc-static-devel liblcms-devel
# nomore noarch with the fbrelolution and progress binaries
#BuildArchitectures: noarch
@@ -91,8 +91,12 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%changelog
+* Wed Sep 08 2004 Warly <warly@mandrakesoft.com> 2.1.12-1mdk
+- remove-theme now does not require an argument
+
* Tue Aug 31 2004 Warly <warly@mandrakesoft.com> 2.1.11-1mdk
- refresh the screen in non latin1 font with a separate /usr partition
+- fix mngplay.static build
* Fri Jul 16 2004 Warly <warly@mandrakesoft.com> 2.1.9-1mdk
- fix rendering for UTF-8 mo (pablo)
diff --git a/fbmngplay/Makefile b/fbmngplay/Makefile
index 8656c1d..33f508e 100644
--- a/fbmngplay/Makefile
+++ b/fbmngplay/Makefile
@@ -27,7 +27,7 @@ PROGRAMS = fbmngplay fbmngplay.static
OBJECTS = fbmngplay.o messages.o mng.o console.o
LDFLAGS = -L$(LIBDIR)
-LIBSS = $(LIBDIR)/libmng.a $(LIBDIR)/libz.a $(LIBDIR)/libjpeg.a -lm
+LIBSS = $(LIBDIR)/libmng.a $(LIBDIR)/libz.a $(LIBDIR)/libjpeg.a $(LIBDIR)/liblcms.a -lm
LIBSD = -lfreetype -lmng -lz -lm
CFLAGS = -O2 -Wall
diff --git a/scripts/remove-theme b/scripts/remove-theme
index 97b4a05..29b105d 100644
--- a/scripts/remove-theme
+++ b/scripts/remove-theme
@@ -36,22 +36,5 @@ function update_boot () {
fi
}
-function usage () {
- basename=`basename $0`
- cat <<EOF
- $basename <theme>
-
-EOF
- exit 1
-}
-
-theme=$1
-
-[[ -z $theme ]] && usage;
-
-[[ -f $sysconfig ]] && . $sysconfig
-
-if [[ $THEME = $theme ]]; then
- remove_theme
- update_boot
-fi
+remove_theme
+update_boot