rpms/pcsc-tools/devel .cvsignore, 1.2, 1.3 pcsc-tools.spec, 1.3, 1.4 sources, 1.2, 1.3 pcsc-tools-1.4.1-atrmsg.patch, 1.1, NONE pcsc-tools-gscriptor.desktop, 1.1, NONE smartcard_list.txt, 1.3, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18783

Modified Files:
	.cvsignore pcsc-tools.spec sources 
Removed Files:
	pcsc-tools-1.4.1-atrmsg.patch pcsc-tools-gscriptor.desktop 
	smartcard_list.txt 
Log Message:
* Wed Mar  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.2-1
- 1.4.2, desktop file, recent smartcard_list.txt, ATR_analysis message
  patch and smartcard_list.txt lookup path improvement included upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 20:45:49 -0000	1.2
+++ .cvsignore	8 Mar 2006 18:37:12 -0000	1.3
@@ -1 +1 @@
-pcsc-tools-1.4.1.tar.gz
+pcsc-tools-1.4.2.tar.gz


Index: pcsc-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pcsc-tools.spec	6 Mar 2006 16:08:32 -0000	1.3
+++ pcsc-tools.spec	8 Mar 2006 18:37:12 -0000	1.4
@@ -1,15 +1,13 @@
 Name:           pcsc-tools
-Version:        1.4.1
-Release:        3%{?dist}
+Version:        1.4.2
+Release:        1%{?dist}
 Summary:        Tools to be used with smart cards and PC/SC
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz
-Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
-Source2:        %{name}-gscriptor.desktop
-Patch0:         %{name}-1.4.1-atrmsg.patch
+#Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -29,14 +27,14 @@
 
 %prep
 %setup -q
-%patch0
 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile
-sed -i -e 's|/usr/lib/pcsc\b|%{_datadir}/pcsc|' ATR_analysis*
 if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then
-sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c
+    sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c
 fi
-iconv -f iso-8859-1 -t utf-8 %{SOURCE1} > smartcard_list.txt
-cp -p %{SOURCE2} gscriptor.desktop
+# cp %{SOURCE1} .
+for f in Changelog smartcard_list.txt ; do
+    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+done
 
 
 %build
@@ -72,6 +70,10 @@
 
 
 %changelog
+* Wed Mar  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.2-1
+- 1.4.2, desktop file, recent smartcard_list.txt, ATR_analysis message
+  patch and smartcard_list.txt lookup path improvement included upstream.
+
 * Mon Mar  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-3
 - Update smartcard_list.txt to 20060305.
 - Fix some ATR_analysis messages.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 20:45:49 -0000	1.2
+++ sources	8 Mar 2006 18:37:12 -0000	1.3
@@ -1 +1 @@
-517cb2a5e6d3170f408cc7550223ed89  pcsc-tools-1.4.1.tar.gz
+9cd68c933fafda78f844b114319a52b8  pcsc-tools-1.4.2.tar.gz


--- pcsc-tools-1.4.1-atrmsg.patch DELETED ---


--- pcsc-tools-gscriptor.desktop DELETED ---


--- smartcard_list.txt DELETED ---