From 7a3e313cd45884b53cdaf906bb22a7f085bca9e0 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Tue, 4 Dec 2007 20:04:48 +0000 Subject: [PATCH] Rebase to pcsc-lite 1.4 --- .cvsignore | 2 +- pcsc-lite-1.4-docinst.patch | 11 +++++++++++ pcsc-lite-docinst.patch | 11 ----------- pcsc-lite.spec | 13 ++++++++----- sources | 2 +- 5 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 pcsc-lite-1.4-docinst.patch delete mode 100644 pcsc-lite-docinst.patch diff --git a/.cvsignore b/.cvsignore index 958a4c8..4cf4eb0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pcsc-lite-1.3.3.tar.gz +pcsc-lite-1.4.4.tar.gz diff --git a/pcsc-lite-1.4-docinst.patch b/pcsc-lite-1.4-docinst.patch new file mode 100644 index 0000000..b4076c8 --- /dev/null +++ b/pcsc-lite-1.4-docinst.patch @@ -0,0 +1,11 @@ +--- ./doc/Makefile.in.docinst 2007-08-14 10:17:26.000000000 -0700 ++++ ./doc/Makefile.in 2007-11-27 09:13:40.000000000 -0800 +@@ -615,7 +615,7 @@ + + info-am: + +-install-data-am: install-docDATA install-man ++install-data-am: install-man + + install-exec-am: + diff --git a/pcsc-lite-docinst.patch b/pcsc-lite-docinst.patch deleted file mode 100644 index 02279cd..0000000 --- a/pcsc-lite-docinst.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.in 2003-05-31 00:24:32.000000000 +0300 -+++ doc/Makefile.in 2003-06-01 15:43:17.000000000 +0300 -@@ -390,7 +390,7 @@ - - info-am: - --install-data-am: install-dataDATA install-man -+install-data-am: install-man - - install-exec-am: - diff --git a/pcsc-lite.spec b/pcsc-lite.spec index 7ca7bbb..477b189 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -1,13 +1,13 @@ Name: pcsc-lite -Version: 1.3.3 +Version: 1.4.4 Release: 1%{dist} Summary: PC/SC Lite smart card framework and applications Group: System Environment/Daemons License: BSD URL: http://pcsclite.alioth.debian.org/ -Source0: http://alioth.debian.org/download.php/1565/%{name}-%{version}.tar.gz -Patch0: %{name}-docinst.patch +Source0: http://alioth.debian.org/download.php/2106/%{name}-%{version}.tar.gz +Patch0: %{name}-1.4-docinst.patch Patch1: %{name}-1.3.0-rpath64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -96,7 +96,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/formaticc.1* %clean -#rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post @@ -144,10 +144,13 @@ fi %files doc %defattr(-,root,root,-) -%doc doc/api/ doc/*.pdf doc/example/pcsc_demo.c +%doc doc/api/ doc/example/pcsc_demo.c %changelog +* Tue Nov 22 2007 Bob Relyea - 1.4.4-1 +- Pick up 1.4.4 + * Tue Feb 06 2007 Bob Relyea - 1.3.3-1 - Pick up 1.3.3 diff --git a/sources b/sources index 276189a..a8c6acf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -851b090aa0efedd0196f6afd9c0c61bb pcsc-lite-1.3.3.tar.gz +6710141d878c12d3b701dc88b9c688c0 pcsc-lite-1.4.4.tar.gz