rpms/thinkfinger/devel thinkfinger-0.3-hal.patch, 1.1, 1.2 thinkfinger.spec, 1.4, 1.5

[Mike Bonnet (mikeb)]

Author: mikeb

Update of /cvs/pkgs/rpms/thinkfinger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2012

Modified Files:
	thinkfinger-0.3-hal.patch thinkfinger.spec 
Log Message:
put fdi file in policy/ directory

thinkfinger-0.3-hal.patch:

Index: thinkfinger-0.3-hal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger-0.3-hal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thinkfinger-0.3-hal.patch	22 Sep 2007 11:13:55 -0000	1.1
+++ thinkfinger-0.3-hal.patch	27 Sep 2007 03:36:44 -0000	1.2
@@ -1,5 +1,5 @@
---- thinkfinger-0.3/data/10-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
-+++ thinkfinger-0.3/data/10-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
+--- thinkfinger-0.3/data/00-thinkfinger.fdi.hal	1970-01-01 01:00:00.000000000 +0100
++++ thinkfinger-0.3/data/00-thinkfinger.fdi	2007-09-22 12:41:33.000000000 +0200
 @@ -0,0 +1,17 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<deviceinfo version="0.2">
@@ -25,11 +25,11 @@
  consoleperms_DATA = 60-thinkfinger.perms
  endif
 + 
-+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
-+halpolicy_DATA = 10-thinkfinger.fdi
++halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
++halpolicy_DATA = 00-thinkfinger.fdi
  
 -EXTRA_DIST = 60-thinkfinger.perms
-+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
++EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
 --- thinkfinger-0.3/data/Makefile.in.hal	2007-09-22 12:40:55.000000000 +0200
 +++ thinkfinger-0.3/data/Makefile.in	2007-09-22 12:41:43.000000000 +0200
 @@ -49,9 +49,11 @@
@@ -51,9 +51,9 @@
  @USE_CONSOLE_PERMS_TRUE at consolepermsdir = $(sysconfdir)/security/console.perms.d
  @USE_CONSOLE_PERMS_TRUE at consoleperms_DATA = 60-thinkfinger.perms
 -EXTRA_DIST = 60-thinkfinger.perms
-+halpolicydir = $(datadir)/hal/fdi/information/20thirdparty
-+halpolicy_DATA = 10-thinkfinger.fdi
-+EXTRA_DIST = 60-thinkfinger.perms 10-thinkfinger.fdi
++halpolicydir = $(datadir)/hal/fdi/policy/10osvendor
++halpolicy_DATA = 00-thinkfinger.fdi
++EXTRA_DIST = 60-thinkfinger.perms 00-thinkfinger.fdi
  all: all-am
  
  .SUFFIXES:


Index: thinkfinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thinkfinger/devel/thinkfinger.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- thinkfinger.spec	22 Sep 2007 11:13:55 -0000	1.4
+++ thinkfinger.spec	27 Sep 2007 03:36:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           thinkfinger
 Version:        0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A driver for the UPEK/SGS Thomson Microelectronics fingerprint reader
 Group:          System Environment/Base
 License:        GPLv2+
@@ -115,7 +115,7 @@
 %{_mandir}/man8/pam_thinkfinger.8.gz
 %{_sysconfdir}/pam_thinkfinger
 %{_sysconfdir}/security/console.perms.d/*
-%{_datadir}/hal/fdi/information/20thirdparty/*
+%{_datadir}/hal/fdi/policy/10osvendor/*
 %config %attr(0755,root,root)/etc/sysconfig/modules/thinkfinger.modules 
 
 %files devel
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Wed Sep 26 2007 Mike Bonnet <mikeb at redhat.com> - 0.3-5
+- put fdi file in policy/ directory
+
 * Wed Sep  5 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.3-4
 - Patched to allow non-root users, making screensavers work. Patches by William Jon McCann and Mike Bonnet (RH #256107)