From 1fe3c9427fb916cf4c60779258c7a8155b16b097 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: Apr 22 2006 20:35:55 +0000
Subject: - 0.11.0-rc1.


---

diff --git a/.cvsignore b/.cvsignore
index 079863c..bebdf3e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-opensc-0.10.1.tar.gz
+opensc-0.11.0-rc1.tar.gz
diff --git a/opensc-0.10.1-rpath64.patch b/opensc-0.10.1-rpath64.patch
deleted file mode 100644
index 1a0a9e4..0000000
--- a/opensc-0.10.1-rpath64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- opensc-0.10.1/configure~	2006-01-08 23:03:28.000000000 +0200
-+++ opensc-0.10.1/configure	2006-02-15 22:52:09.000000000 +0200
-@@ -9016,7 +9016,7 @@
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
---- opensc-0.10.1/aclocal.m4~	2006-01-08 23:03:24.000000000 +0200
-+++ opensc-0.10.1/aclocal.m4	2006-02-15 22:50:47.000000000 +0200
-@@ -1581,7 +1581,7 @@
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/opensc.spec b/opensc.spec
index 153a1ab..f638909 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,15 +1,14 @@
 %define plugindir %{_libdir}/mozilla/plugins
 
 Name:           opensc
-Version:        0.10.1
-Release:        3%{?dist}
+Version:        0.11.0
+Release:        0.1.rc1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://www.opensc.org/
-Source0:        http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.10.1-rpath64.patch
+URL:            http://www.opensc-project.org/
+Source0:        http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -17,6 +16,7 @@ BuildRequires:  readline-devel
 BuildRequires:  openct-devel
 BuildRequires:  openssl-devel >= 0.9.7a
 BuildRequires:  libtool-ltdl-devel
+BuildRequires:  libtool
 
 %description
 OpenSC is a package for for accessing smart card devices.  Basic
@@ -50,9 +50,8 @@ OpenSC development files.
 
 
 %prep
-%setup -q
-# patch0: --disable-rpath doesn't seem to do what it implies
-%patch0 -p1
+%setup -q -n %{name}-%{version}-rc1
+sh bootstrap # avoid standard rpaths on lib64 archs
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
 
@@ -74,14 +73,12 @@ install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
 install -dm 755 _docs/openssh
 install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh
 cp -pR doc _docs
-rm -r _docs/doc/{*.sh,*.xsl,old,Makefile*,tools}
+rm -r _docs/doc/{*.sh,*.xsl,api,Makefile*,tools}
 
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm
 
 rm $RPM_BUILD_ROOT%{plugindir}/opensc-signer.so
-mv $RPM_BUILD_ROOT%{_libdir}/opensc/opensc-signer.so \
-  $RPM_BUILD_ROOT%{plugindir}
-rmdir $RPM_BUILD_ROOT%{_libdir}/opensc
+mv $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{plugindir}
 
 
 %clean
@@ -103,6 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/netkey-tool
 %{_bindir}/opensc-explorer
 %{_bindir}/opensc-tool
+%{_bindir}/piv-tool
 %{_bindir}/pkcs11-tool
 %{_bindir}/pkcs15-crypt
 %{_bindir}/pkcs15-init
@@ -138,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.11.0-0.1.rc1
+- 0.11.0-rc1.
+
 * Mon Mar  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.10.1-3
 - Rebuild.
 
diff --git a/sources b/sources
index 6ceaa41..ccb4b60 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5549c7c339775356784837887750d232  opensc-0.10.1.tar.gz
+a911854594332241b62e5ed07b2e3a21  opensc-0.11.0-rc1.tar.gz