From 6ff1a604420ebfc8e90a30b345509ac877afc274 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: May 31 2006 19:42:32 +0000
Subject: - 0.11.1.

- Avoid some multilib conflicts.

---

diff --git a/.cvsignore b/.cvsignore
index 841ad67..8b567af 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-opensc-0.11.0.tar.gz
+opensc-0.11.1.tar.gz
diff --git a/opensc-0.11.1-develconfig.patch b/opensc-0.11.1-develconfig.patch
new file mode 100644
index 0000000..d769ccb
--- /dev/null
+++ b/opensc-0.11.1-develconfig.patch
@@ -0,0 +1,23 @@
+--- opensc-0.11.1/src/libopensc/opensc-config.in~	2005-12-29 14:36:30.000000000 +0200
++++ opensc-0.11.1/src/libopensc/opensc-config.in	2006-05-31 22:26:57.000000000 +0300
+@@ -14,8 +14,8 @@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ 
+-opensc_libs="@OPENSC_LIBS@"
+-opensc_cflags="@OPENSC_CFLAGS@"
++opensc_libs="`pkg-config libopensc --libs`"
++opensc_cflags="`pkg-config libopensc --cflags`"
+ 
+ 
+ usage()
+--- opensc-0.11.1/src/libopensc/libopensc.pc.in~	2005-12-29 14:36:30.000000000 +0200
++++ opensc-0.11.1/src/libopensc/libopensc.pc.in	2006-05-31 22:26:54.000000000 +0300
+@@ -6,6 +6,6 @@
+ Name: libopensc
+ Description: libopensc
+ Version: @VERSION@
+-Libs: -L${libdir} -lopensc -lscconf
++Libs: -L${libdir} -lopensc
+ Cflags: -I${includedir}
+ 
diff --git a/opensc.spec b/opensc.spec
index 940009d..f2e3678 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,14 +1,15 @@
 %define plugindir %{_libdir}/mozilla/plugins
 
 Name:           opensc
-Version:        0.11.0
-Release:        2%{?dist}
+Version:        0.11.1
+Release:        1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.opensc-project.org/opensc/
 Source0:        http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.11.1-develconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -51,10 +52,12 @@ OpenSC development files.
 
 %prep
 %setup -q
+%patch0 -p1
 sh bootstrap # avoid standard rpaths on lib64 archs
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
-sed -i -e 's|/usr/local/towitoko/lib/|%{_libdir}/ctapi/|' etc/opensc.conf.in
+# No %{_libdir} here to avoid multilib conflicts; it's just an example
+sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in
 
 
 %build
@@ -137,6 +140,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.11.1-1
+- 0.11.1.
+- Avoid some multilib conflicts.
+
 * Sun May  7 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.11.0-2
 - Sync example paths in openct.conf with ctapi-common.
 - Update URL.
diff --git a/sources b/sources
index 3d8fed3..94c037e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be9cced6c703253baf78ccd9970679fa  opensc-0.11.0.tar.gz
+94ce00a6bda38fac10ab06f5d5d1a8c3  opensc-0.11.1.tar.gz