X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fbset.spec;h=c384e3a8eb4f9707b96e13ff21d9375fe85d5fb2;hb=f47868b7c7c396006f609b9945e99d0fe05d48f7;hp=7282e5a153dc4dd10a4c5aa7e99829c4cdc6816e;hpb=8ecfb082e5f01b23c445a16de6898cbda8e30043;p=packages%2Ffbset.git

diff --git a/fbset.spec b/fbset.spec
index 7282e5a..c384e3a 100644
--- a/fbset.spec
+++ b/fbset.spec
@@ -2,17 +2,19 @@ Summary:	Framebuffer utilities for changing video modes
 Summary(pl):	Narzêdzie do zmieniania ustawieñ framebuffera
 Name:		fbset
 Version:	2.1
-Release:	23
+Release:	29
 License:	GPL
 Group:		Applications/System
 Source0:	http://home.tvd.be/cr26864/Linux/fbdev/%{name}-%{version}.tar.gz
-# Source0-md5: e547cfcbb8c1a4f2a6b8ba4acb8b7164
+# 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
 Patch1:		%{name}-from-kgicon.patch
-URL:		http://home.tvd.be/cr26864/Linux/fbdev/
+URL:		http://members.chello.be/cr26864/Linux/fbdev/
 BuildRequires:	bison
 BuildRequires:	flex
 Requires(post,preun):	/sbin/chkconfig
@@ -20,7 +22,7 @@ Requires:	open
 Requires:	sed
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoreqfiles	/usr/bin/modeline2fb
+%define		_noautoreqfiles	/usr/sbin/modeline2fb
 
 %description
 fbset is a utility for querying and changing video modes of fbcon
@@ -40,15 +42,22 @@ na wpisy fb.modes) wymaga perla.
 %setup -q
 %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} \
 	$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
@@ -58,7 +67,6 @@ 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
-rm -r etc/CVS
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,9 +82,8 @@ 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
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/fbset
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fb.modes
 %{_mandir}/man*/*