rpms/fbterm/F-12 fbterm.spec,1.12,1.13 import.log,1.9,1.10

[Ding-Yi Chen]

Author: dchen

Update of /cvs/pkgs/rpms/fbterm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23605/F-12

Modified Files:
	fbterm.spec import.log 
Log Message:
Resolves: #565710


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-12/fbterm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- fbterm.spec	1 Dec 2009 01:17:58 -0000	1.12
+++ fbterm.spec	24 Feb 2010 00:36:23 -0000	1.13
@@ -1,6 +1,6 @@
 Name:       fbterm
 Version:    1.6
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
@@ -10,10 +10,12 @@ Source0:    http://fbterm.googlecode.com
 #Patch2:    %{name}-1.4-iminput.patch
 Patch3:    %{name}-1.6-rpmpack.patch
 Patch4:    %{name}-1.6-el5.patch
-Summary:    A frame buffer terminal emulator
+Summary:    A frame-buffer terminal emulator
 Summary(zh_CN): 运行在帧缓冲的快速终端仿真器
-Summary(zh_TW): 運行在Framebuffer的快速終端模擬機
-
+Summary(zh_TW): 運行在frame-buffer的快速終端模擬機
+%define fbterm_rules_name 99-fbterm.rules
+%define fbterm_rules_dir %{_sysconfdir}/udev/rules.d
+%define fbterm_rules_path %{fbterm_rules_dir}/%{fbterm_rules_name}
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,15 +24,15 @@ BuildRequires: fontconfig-devel gpm-deve
 Requires: fontconfig
 
 %description
-FbTerm is a fast terminal emulator for linux with frame buffer device. 
+FbTerm is a fast terminal emulator for Linux with frame-buffer device. 
 Features include: 
-- mostly as fast as terminal of linux kernel while accelerated scrolling
-  is enabled on framebuffer device 
+- mostly as fast as terminal of Linux kernel while accelerated scrolling
+  is enabled on frame-buffer device 
 - select font with fontconfig and draw text with freetype2, same as 
   Qt/Gtk+ based GUI apps 
-- dynamicly create/destroy up to 10 windows initially running default
+- dynamically create/destroy up to 10 windows initially running default
   shell 
-- record scrollback history for every window 
+- record scroll back history for every window 
 - auto-detect text encoding with current locale, support double width 
   scripts like  Chinese, Japanese etc 
 - switch between configurable additional text encodings with hot keys
@@ -38,6 +40,19 @@ Features include: 
 - copy/past selected text between windows with mouse when gpm server 
   is running
 
+
+%if 0%{?fedora} >= 9
+%package udevrules
+Group:      Applications/System
+Summary:    udev rules that grant regular user access
+Requires:   udev
+
+%description udevrules
+Regular users might use some applications that require access to frame-buffer device.
+For example, ibus-fbterm requires access to /dev/fb0.
+This sub-package enables regular user for such access.
+%endif
+
 %prep
 %setup -q
 #%patch0 -p0 -b .kernel-header
@@ -55,10 +70,15 @@ autoreconf -iv
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
-chmod 755 $RPM_BUILD_ROOT/%{_bindir}/%{name}
-
+%__rm -rf $RPM_BUILD_ROOT
+%__make DESTDIR=${RPM_BUILD_ROOT} install
+%__chmod 755 $RPM_BUILD_ROOT/%{_bindir}/%{name}
+%if 0%{?fedora} >= 9
+%__mkdir -p $RPM_BUILD_ROOT/%{fbterm_rules_dir}
+%__cat >>$RPM_BUILD_ROOT/%{fbterm_rules_path} <<EOF
+KERNEL=="fb[0-9]*", SUBSYSTEM=="graphics", MODE="0666"
+EOF
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,7 +88,6 @@ rm -rf $RPM_BUILD_ROOT
 setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
 %endif
 
-
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -79,8 +98,18 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
 %endif
 %{_mandir}/man1/%{name}.1.gz
 
+%if 0%{?fedora} >= 9
+%files udevrules
+%defattr(-,root,root,-)
+%config(noreplace) %{fbterm_rules_path}
+%endif
+
 
 %changelog
+* Wed Feb 24 2010 Ding-Yi Chen <dchen at redhat dot com> - 1.6-2
+- Resolves: #565710
+  Add udevrules sub package for installing udev rules for granting regular user access.
+
 * Mon Nov 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.6-1
 - Fixed [Bug 539186] FTBFS fbterm-1.5-2.fc12
 - Upstream fixed [Bug 542284] terminfo file for fbterm not included with fbterm package in fedora.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-12/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	1 Dec 2009 01:17:58 -0000	1.9
+++ import.log	24 Feb 2010 00:36:23 -0000	1.10
@@ -7,3 +7,4 @@ fbterm-1_3-1_fc10:HEAD:fbterm-1.3-1.fc10
 fbterm-1_4-1_fc10:HEAD:fbterm-1.4-1.fc10.src.rpm:1237784276
 fbterm-1_5-1_fc11:HEAD:fbterm-1.5-1.fc11.src.rpm:1242363702
 fbterm-1_6-1_fc12:F-12:fbterm-1.6-1.fc12.src.rpm:1259630149
+fbterm-1_6-2_fc12:F-12:fbterm-1.6-2.fc12.src.rpm:1266971648