aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bootsplash.spec8
-rw-r--r--fb/Makefile6
2 files changed, 8 insertions, 6 deletions
diff --git a/bootsplash.spec b/bootsplash.spec
index f68084c..717bacd 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -1,5 +1,5 @@
%define name bootsplash
-%define version 3.1.2
+%define version 3.1.3
%define release 1mdk
%define _bootdir /boot
@@ -20,7 +20,7 @@ Requires: mkinitrd >= 3.5.18-14mdk
Requires: kernel initscripts > 7.04-15mdk fbgrab
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 liblcms-devel
+BuildRequires: freetype2-static-devel libmng-static-devel libjpeg-static-devel glibc-static-devel liblcms-devel libgtk-linux-fb-2.0-devel
# nomore noarch with the fbrelolution and progress binaries
#BuildArchitectures: noarch
@@ -86,9 +86,11 @@ rm -rf $RPM_BUILD_ROOT
/bin/*
/sbin/*
%{_bindir}/*
-%{_libdir}/*
%changelog
+* Thu Mar 10 2005 Warly <warly@mandrakesoft.com> 3.1.3-1mdk
+- now use libgtk-linux-fb-2.0-devel
+
* Fri Feb 18 2005 Warly <warly@mandrakesoft.com> 3.1.2-1mdk
- include fbmenu into the package
diff --git a/fb/Makefile b/fb/Makefile
index e5671ec..22572be 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 libgtk-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.so -o fbmenu fbmenu.c;
progress: progress.c
$(CC) $(CFLAGS) $(FSFLAGS) -o $@ progress.c
@@ -34,9 +34,9 @@ install:
mkdir -p $(bindir) $(mbindir) $(libdir)
install -s -m755 progress $(mbindir)
install -m755 fbresolution $(mbindir)
- install -m755 libgdk-linux-fb-2.0.so.0.400.14 $(libdir)
install -m755 fbmenu $(bindir)
- install -m755 libgtk-linux-fb-2.0.so.0.400.14 $(libdir)
+# install -m755 libgdk-linux-fb-2.0.so.0.400.14 $(libdir)
+# install -m755 libgtk-linux-fb-2.0.so.0.400.14 $(libdir)
clean:
rm -f *~ *.o *.bak core $(PROGS)