rpms/opensc/devel opensc-0.11.1-develconfig.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 opensc.spec, 1.14, 1.15 sources, 1.8, 1.9

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17706/devel

Modified Files:
	.cvsignore opensc.spec sources 
Added Files:
	opensc-0.11.1-develconfig.patch 
Log Message:
* Wed May 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.11.1-1
- 0.11.1.
- Avoid some multilib conflicts.


opensc-0.11.1-develconfig.patch:

--- NEW FILE opensc-0.11.1-develconfig.patch ---
--- 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}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 May 2006 17:05:31 -0000	1.8
+++ .cvsignore	31 May 2006 19:42:32 -0000	1.9
@@ -1 +1 @@
-opensc-0.11.0.tar.gz
+opensc-0.11.1.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- opensc.spec	7 May 2006 13:49:24 -0000	1.14
+++ opensc.spec	31 May 2006 19:42:32 -0000	1.15
@@ -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 @@
 
 %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 @@
 
 
 %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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 May 2006 17:05:31 -0000	1.8
+++ sources	31 May 2006 19:42:32 -0000	1.9
@@ -1 +1 @@
-be9cced6c703253baf78ccd9970679fa  opensc-0.11.0.tar.gz
+94ce00a6bda38fac10ab06f5d5d1a8c3  opensc-0.11.1.tar.gz