diff options
| author | Florent Villard <warly@mandriva.com> | 2005-03-22 11:38:46 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2005-03-22 11:38:46 +0000 |
| commit | 104f685b6eb2278db355ba7273a4c33185f976a6 (patch) | |
| tree | 6ddb4419a0e8b0ae0750ef044457fe51e89ce27e | |
| parent | 40786f326c596b02f1b0a0a6726870750c83c700 (diff) | |
| download | bootsplash-104f685b6eb2278db355ba7273a4c33185f976a6.tar bootsplash-104f685b6eb2278db355ba7273a4c33185f976a6.tar.gz bootsplash-104f685b6eb2278db355ba7273a4c33185f976a6.tar.bz2 bootsplash-104f685b6eb2278db355ba7273a4c33185f976a6.tar.xz bootsplash-104f685b6eb2278db355ba7273a4c33185f976a6.zip | |
fix fbmenu compilation
| -rw-r--r-- | bootsplash.spec | 8 | ||||
| -rw-r--r-- | fb/Makefile | 2 | ||||
| -rw-r--r-- | scripts/bootanim | 18 |
3 files changed, 16 insertions, 12 deletions
diff --git a/bootsplash.spec b/bootsplash.spec index 717bacd..9f948a5 100644 --- a/bootsplash.spec +++ b/bootsplash.spec @@ -1,5 +1,5 @@ %define name bootsplash -%define version 3.1.3 +%define version 3.1.5 %define release 1mdk %define _bootdir /boot @@ -88,6 +88,12 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* Tue Mar 22 2005 Warly <warly@mandrakesoft.com> 3.1.5-1mdk +- Fix fbmenu compilation + +* Thu Mar 17 2005 Warly <warly@mandrakesoft.com> 3.1.4-1mdk +- bootanim now uses bash getopts builtin + * Thu Mar 10 2005 Warly <warly@mandrakesoft.com> 3.1.3-1mdk - now use libgtk-linux-fb-2.0-devel diff --git a/fb/Makefile b/fb/Makefile index 22572be..e27a9c4 100644 --- a/fb/Makefile +++ b/fb/Makefile @@ -25,7 +25,7 @@ xmenu: fbmenu.c gcc $(GTK_CFLAGS) -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -O2 -Wall -lgtk-x11-2.0 -o xmenu fbmenu.c; fbmenu: fbmenu.c - gcc $(GTK_CFLAGS) -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -O2 -Wall -lgtk-linux-fb-2.0.so -o fbmenu fbmenu.c; + gcc $(GTK_CFLAGS) -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -O2 -Wall -lgtk-linux-fb-2.0 -o fbmenu fbmenu.c; progress: progress.c $(CC) $(CFLAGS) $(FSFLAGS) -o $@ progress.c diff --git a/scripts/bootanim b/scripts/bootanim index f0c7f30..c850081 100644 --- a/scripts/bootanim +++ b/scripts/bootanim @@ -43,7 +43,7 @@ fi THEME="No theme selected" test -f /etc/sysconfig/bootsplash && . /etc/sysconfig/bootsplash -if [ ! -d /etc/bootsplash/themes/$THEME ] +if [ ! -d "/etc/bootsplash/themes/$THEME" ] then echo "$0: could not find theme $THEME in /etc/bootsplash/themes." exit 0 @@ -85,13 +85,11 @@ shift # We end up in bootanim start -TEMP=`getopt -o mr:d: -- "$@"` -eval set -- "$TEMP" - -while true ; do +while getopts mr:d opt "$@" + do # echo "loop: $*" - case "$1" in - -d) # directory + case "$opt" in + d) # directory shift if [ ! -d "$1" ]; then echo "Not a valid directory." @@ -100,16 +98,16 @@ while true ; do DIRECTORY=$1 shift ;; - -r) # resolution + r) # resolution shift MODE=$1; shift ;; - -m) # multiple files + m) # multiple files shift OPTIONS="$OPTIONS -s" ;; - --) # end + -) # end shift break;; *) # Weird |