- 0.11.1.

- Avoid some multilib conflicts.
This commit is contained in:
Ville Skyttä 2006-05-31 19:42:32 +00:00
parent 6df7f9aec0
commit 6ff1a60442
4 changed files with 35 additions and 5 deletions

View File

@ -1 +1 @@
opensc-0.11.0.tar.gz
opensc-0.11.1.tar.gz

View File

@ -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}

View File

@ -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.

View File

@ -1 +1 @@
be9cced6c703253baf78ccd9970679fa opensc-0.11.0.tar.gz
94ce00a6bda38fac10ab06f5d5d1a8c3 opensc-0.11.1.tar.gz