- added con2fb utility and used it in init script

- rel 24

Changed files:
    fbset.spec -> 1.50

diff --git a/fbset.spec b/fbset.spec
index 23f0fe8c275ac044e6765e38fdf27542cadcc579..fab15c041630b507816a72218951286c7f6e3649 100644 (file)
--- a/fbset.spec
+++ b/fbset.spec
@@ -2,7 +2,7 @@ Summary:        Framebuffer utilities for changing video modes
 Summary(pl):   Narzêdzie do zmieniania ustawieñ framebuffera
 Name:          fbset
 Version:       2.1
-Release:       23
+Release:       24
 License:       GPL
 Group:         Applications/System
 Source0:       http://home.tvd.be/cr26864/Linux/fbdev/%{name}-%{version}.tar.gz
@@ -10,6 +10,8 @@ Source0:      http://home.tvd.be/cr26864/Linux/fbdev/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-fb.modes
+Source4:       ftp://ftp.platan.vc.cvut.cz/pub/linux/matrox-latest/con2fb.c.gz
+# Source4-md5: 10485e073441a83f4ca26d4ccf73ab64
 Patch0:                %{name}-fixmode.patch
 Patch1:                %{name}-from-kgicon.patch
 URL:           http://home.tvd.be/cr26864/Linux/fbdev/
@@ -40,15 +42,19 @@ na wpisy fb.modes) wymaga perla.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+cp %{SOURCE4} .
+gunzip con2fb.c.gz
 
 %build
 %{__make} CC="%{__cc} %{rpmcflags}"
+%{__cc} %{rpmcflags} %{rpmldflags} -o con2fb con2fb.c
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \
        $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man{5,8}}
 
+install con2fb $RPM_BUILD_ROOT%{_bindir}
 install fbset $RPM_BUILD_ROOT%{_bindir}
 install modeline2fb $RPM_BUILD_ROOT%{_bindir}
 install fb.modes.5 $RPM_BUILD_ROOT%{_mandir}/man5
@@ -74,8 +80,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc etc/*
-%attr(755,root,root) %{_bindir}/fbset
-%attr(755,root,root) %{_bindir}/modeline2fb
+%attr(755,root,root) %{_bindir}/*
 %attr(754,root,root) /etc/rc.d/init.d/fbset
 %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/fbset
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/fb.modes