rpms/openct/devel openct-0.6.16-udevadm.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 openct.spec, 1.35, 1.36 sources, 1.17, 1.18

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/openct/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30971

Modified Files:
	.cvsignore openct.spec sources 
Added Files:
	openct-0.6.16-udevadm.patch 
Log Message:
* Mon Jun 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.16-1
- Update to latest upstream
- Prefer udevname to udevinfo (#506163)


openct-0.6.16-udevadm.patch:

--- NEW FILE openct-0.6.16-udevadm.patch ---
diff -up openct-0.6.16/etc/openct_usb.in.udevadm openct-0.6.16/etc/openct_usb.in
--- openct-0.6.16/etc/openct_usb.in.udevadm	2008-12-27 16:51:56.000000000 +0100
+++ openct-0.6.16/etc/openct_usb.in	2009-06-15 22:11:06.000000000 +0200
@@ -10,10 +10,10 @@ if [ -z "$DEVNAME" ]; then
 	# Guess udev info interface.
 	# Newer udev uses udevadm
 	#
-	if which udevinfo > /dev/null 2>&1; then
-		UDEVINFO="udevinfo"
-	else
+	if which udevadm > /dev/null 2>&1; then
 		UDEVINFO="udevadm info"
+	else
+		UDEVINFO="udevinfo"
 	fi
 	DEVNAME=/dev/$($UDEVINFO --query=name --path=$(dirname $DEVPATH))
 fi


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	2 Sep 2008 12:35:02 -0000	1.17
+++ .cvsignore	15 Jun 2009 20:40:49 -0000	1.18
@@ -1 +1 @@
-openct-0.6.15.tar.gz
+openct-0.6.16.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/openct.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- openct.spec	26 Feb 2009 08:26:53 -0000	1.35
+++ openct.spec	15 Jun 2009 20:40:49 -0000	1.36
@@ -3,8 +3,8 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.15
-Release:        4%{?dist}
+Version:        0.6.16
+Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@ Source0:        http://www.opensc-projec
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch1:         %{name}-0.6.15-nosleep-287871.patch
+Patch2:         %{name}-0.6.16-udevadm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.3.0
@@ -58,7 +59,9 @@ OpenCT available for PC/SC Lite.
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p1 -b .nosleep
+%patch2 -p1 -b .udevadm
+
 # fix lib64 std rpaths and other weirdness
 sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' \
        -e 's|^usrsbindir=.*$|usrsbindir="%{_sbindir}"|' \
@@ -176,6 +179,10 @@ fi
 
 
 %changelog
+* Mon Jun 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.16-1
+- Update to latest upstream
+- Prefer udevname to udevinfo (#506163)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	2 Sep 2008 12:35:02 -0000	1.17
+++ sources	15 Jun 2009 20:40:49 -0000	1.18
@@ -1 +1 @@
-70205beac03974e266fc259b6c9feaa8  openct-0.6.15.tar.gz
+d8d8c63269985303a303a218c4b953d7  openct-0.6.16.tar.gz