- fixes to build with texinfo 7; release 6

diff --git a/fbgetty-info.patch b/fbgetty-info.patch
index f83bdeb4e14c9ef6d53a1072a4cec562ed33798b..0fda0b4688cb2ae6b43f6276bb59aed82117ed00 100644 (file)
--- a/fbgetty-info.patch
+++ b/fbgetty-info.patch
@@ -1,10 +1,11 @@
 --- fbgetty-0.1.698/docs/fbgetty.texi.orig     Sat Jul 21 21:55:23 2001
 +++ fbgetty-0.1.698/docs/fbgetty.texi  Fri Nov  1 17:47:41 2002
-@@ -7,9 +7,9 @@
+@@ -7,9 +7,10 @@
  
  @include version.texi
  
 -@dircategory Console Tools
++@documentencoding ISO-8859-1
 +@dircategory Miscellaneous:
  @direntry
 -* fbgetty: (fbgetty).         A linux specific getty program
@@ -12,3 +13,16 @@
  @end direntry
  
  @ifinfo
+@@ -135,10 +136,10 @@ Display this @var{prompt} to invite.
+ @itemx --login-timeout=@var{timeout}
+ Set login timeout to @var{timeout}. This is for erasing login after a long time (security purpose).
+ 
+-@itemx --version
++@item --version
+ Display version (only use in interactive mode: do not use it in the inittab)
+ 
+-@itemx --help
++@item --help
+ Display the list of switch
+ @end table
+ 

diff --git a/fbgetty.spec b/fbgetty.spec
index e548afb194054546128a61042c44b2f206852028..2c3e098588da6e782b17c7ef2a7e5c9ea51480cf 100644 (file)
--- a/fbgetty.spec
+++ b/fbgetty.spec
@@ -2,7 +2,7 @@ Summary:        getty program for Linux framebuffer console
 Summary(pl.UTF-8):     Program getty dla linuksowej konsoli z framebufferem
 Name:          fbgetty
 Version:       0.1.698
-Release:       5
+Release:       6
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://projects.meuh.org/fbgetty/downloads/%{name}-%{version}.tar.gz
@@ -44,7 +44,7 @@ Możliwości:
 
 %build
 cp -f /usr/share/automake/config.* config
-CPPFLAGS="-Doffsetof=__builtin_offsetof"; export CPPFLAGS
+export CPPFLAGS="%{rpmcppflags} -Doffsetof=__builtin_offsetof"
 %configure
 %{__make}
 
@@ -57,15 +57,15 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p      /sbin/postshell
+%post  -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun        -p      /sbin/postshell
+%postun        -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS ChangeLog NEWS README THANKS TODO docs/*.txt
-%attr(755,root,root) %{_sbindir}/*
-%{_mandir}/man8/*
-%{_infodir}/*.info*
+%attr(755,root,root) %{_sbindir}/fbgetty
+%{_mandir}/man8/fbgetty.8*
+%{_infodir}/fbgetty.info*