- typo

[packages/fbset.git] / fbset.spec

diff --git a/fbset.spec b/fbset.spec
index afb83fdda95b7ede764b3472892ede082edecc08..c384e3a8eb4f9707b96e13ff21d9375fe85d5fb2 100644 (file)
--- a/fbset.spec
+++ b/fbset.spec
@@ -1,46 +1,69 @@
 Summary:       Framebuffer utilities for changing video modes
-Summary(pl):   Nardzêdzie do zmieniania trybu graficznego we framebufferze
+Summary(pl):   Narzêdzie do zmieniania ustawieñ framebuffera
 Name:          fbset
 Version:       2.1
-Release:       19
+Release:       29
 License:       GPL
 Group:         Applications/System
 Source0:       http://home.tvd.be/cr26864/Linux/fbdev/%{name}-%{version}.tar.gz
+# Source0-md5: e547cfcbb8c1a4f2a6b8ba4acb8b7164
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
+Source3:       %{name}-fb.modes
+Source4:       ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/con2fb.c.gz
+# Source4-md5: 10485e073441a83f4ca26d4ccf73ab64
 Patch0:                %{name}-fixmode.patch
-URL:           http://home.tvd.be/cr26864/Linux/fbdev/
+Patch1:                %{name}-from-kgicon.patch
+URL:           http://members.chello.be/cr26864/Linux/fbdev/
 BuildRequires: bison
 BuildRequires: flex
-Prereq:                /sbin/chkconfig
+Requires(post,preun):  /sbin/chkconfig
 Requires:      open
 Requires:      sed
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _noautoreqfiles /usr/sbin/modeline2fb
+
 %description
 fbset is a utility for querying and changing video modes of fbcon
 terminals.
 
+Note: modeline2fb script (which translates XFree86 modelines to
+fb.modes entries) requires perl.
+
 %description -l pl
 fbset jest narzêdziem do sprawdzania i zmieniania trybu graficznego na
 terminalach fbcon.
 
+Uwaga: skrypt modeline2fb (s³u¿±cy do t³umaczenia modeline'ów XFree86
+na wpisy fb.modes) wymaga perla.
+
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+cp %{SOURCE4} .
+gunzip con2fb.c.gz
+rm -r etc/CVS
 
 %build
-%{__make} CC="%{__cc} %{rpmcflags}"
+%{__make} -j1 \
+       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},%{_sbindir},%{_mandir}/man{5,8}}
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \
+       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man{5,8}}
 
-install fbset $RPM_BUILD_ROOT%{_sbindir}
+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
 install fbset.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
-install etc/fb.modes.ATI $RPM_BUILD_ROOT%{_sysconfdir}/fb.modes
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fb.modes
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/fbset
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/fbset
@@ -58,8 +81,9 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/fbset
+%doc etc/*
+%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
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/fbset
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fb.modes
 %{_mandir}/man*/*