rpms/tpb/devel tpb-nvram.permissions, NONE, 1.1 tpb-defaultconfig.patch, 1.2, 1.3 tpb.spec, 1.4, 1.5

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/tpb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23445

Modified Files:
	tpb-defaultconfig.patch tpb.spec 
Added Files:
	tpb-nvram.permissions 
Log Message:
Add udev-awareness to /dev/nvram handling (#147306), better default OSD font.


--- NEW FILE tpb-nvram.permissions ---
# udev permissions/ownership map for nvram for use with tpb

nvram:root:root:0644

tpb-defaultconfig.patch:

Index: tpb-defaultconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/tpb/devel/tpb-defaultconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tpb-defaultconfig.patch	8 Nov 2004 05:28:39 -0000	1.2
+++ tpb-defaultconfig.patch	9 Feb 2005 22:01:51 -0000	1.3
@@ -28,7 +28,7 @@
  # one. Default is the default font of the xosd library.
  #
 -#OSDFONT     -*-lucidatypewriter-*-*-*-*-*-240-*-*-*-*-*-*
-+OSDFONT     -*-*-*-r-*-sans-17-*-*-*-*-*-*-*
++OSDFONT     -*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*
  
  ## OSDCOLOR
  # Defines the color of the on-screen display. You may use "xcolors" to choose


Index: tpb.spec
===================================================================
RCS file: /cvs/extras/rpms/tpb/devel/tpb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tpb.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ tpb.spec	9 Feb 2005 22:01:51 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           tpb
 Version:        0.6.3
-Release:        1
+Release:        2
 Epoch:          0
 Summary:        IBM ThinkPad button support utility
 
@@ -9,10 +9,12 @@
 URL:            http://www.nongnu.org/tpb/
 Source0:        http://savannah.nongnu.org/download/tpb/tpb-0.6.3.tar.gz
 Source1:        http://savannah.nongnu.org/download/tpb/tpb-0.6.3.tar.gz.sig
+Source2:        %{name}-nvram.permissions
 Patch0:         %{name}-defaultconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xosd-devel >= 0:2.0.0, XFree86-devel, gettext
+BuildRequires:  xosd-devel >= 0:2.0.0, XFree86-devel, gettext, /sbin/MAKEDEV
+Requires:       udev
 
 %description
 With TPB it is possible to bind a program to the ThinkPad, Mail, Home
@@ -43,25 +45,34 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dm 755 %{name}.xinit \
   $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/%{name}.sh
+install -Dpm 644 %{SOURCE2} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/udev/permissions.d/49-%{name}-nvram.permissions
+/sbin/MAKEDEV -M nvram > %{name}.files
+/sbin/MAKEDEV -d %{_sysconfdir}/udev/devices -M nvram >> %{name}.files
+sed -i s/600/644/ %{name}.files # console.perms.d would be nice
 %find_lang %{name}
+cat %{name}.lang >> %{name}.files
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f %{name}.lang
+%files -f %{name}.files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING CREDITS README doc/callback_example.sh doc/nvram.txt
 %config %{_sysconfdir}/X11/xinit/xinitrc.d/%{name}.sh
+%config(noreplace) %{_sysconfdir}/udev/permissions.d/*%{name}-nvram.permissions
 %config(noreplace) %{_sysconfdir}/tpbrc
 %{_bindir}/tpb
 %{_mandir}/man1/tpb.1*
-# Note: need read access here.
-%attr(644,root,root) %dev(c,10,144) /dev/nvram
 
 
 %changelog
+* Wed Feb  9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.3-2
+- Add udev-awareness to /dev/nvram handling (#147306, Matthew Saltzman).
+- Change default OSD font to "luxi sans", "sans" doesn't work early enough.
+
 * Tue Aug 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.3-0.fdr.1
 - Update to 0.6.3.
 - Further small improvements to default config.