X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fbset.spec;h=fcf4dd0544b687a8f3bccd5c047366ca395f8470;hb=94975808f5da4ea5952d406b16790b80ede05d9e;hp=dfe33a420f864595b8ab3a0bb1b14e9a7e8cecbb;hpb=7e509815c653aacd24d9ba3a8c0039ca5f7ebcad;p=packages%2Ffbset.git

diff --git a/fbset.spec b/fbset.spec
index dfe33a4..fcf4dd0 100644
--- a/fbset.spec
+++ b/fbset.spec
@@ -1,48 +1,71 @@
 Summary:	Framebuffer utilities for changing video modes
-Summary(pl):	Nardzêdzie do zmieniania trybu graficznego we framebufferze
+Summary(pl.UTF-8):	Narzędzie do zmieniania ustawień framebuffera
 Name:		fbset
 Version:	2.1
-Release:	15
+Release:	31
 License:	GPL
 Group:		Applications/System
-Group(de):	Applikationen/System
-Group(pl):	Aplikacje/System
-Source0:	http://www.cs.kuleuven.ac.be/~geert/bin/%{name}-%{version}.tar.gz
+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://www.cs.kuleuven.ac.be/~geert/Console/
+Patch1:		%{name}-from-kgicon.patch
+Patch2:		%{name}-con2fb.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.
 
-%description -l pl
-fbset jest narzêdziem do sprawdzania i zmieniania trybu graficznego na
+Note: modeline2fb script (which translates XFree86 modelines to
+fb.modes entries) requires perl.
+
+%description -l pl.UTF-8
+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
+%patch2 -p0
+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
@@ -60,8 +83,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*/*