[opensc] add patch for dso

Peter Robinson pbrobinson at fedoraproject.org
Sun Mar 4 11:41:25 UTC 2012


commit 54444266c6c89e082066af4ae8cf179a25647a42
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Mar 4 11:41:10 2012 +0000

    add patch for dso

 opensc-fixdso.patch |   11 +++++++++++
 opensc.spec         |   14 +++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/opensc-fixdso.patch b/opensc-fixdso.patch
new file mode 100644
index 0000000..5b91e92
--- /dev/null
+++ b/opensc-fixdso.patch
@@ -0,0 +1,11 @@
+--- opensc-0.12.2/src/tools/Makefile.in.orig	2012-03-04 10:44:40.504646428 +0000
++++ opensc-0.12.2/src/tools/Makefile.in	2012-03-04 10:44:52.817647048 +0000
+@@ -232,7 +232,7 @@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -ldl
+ LIBOBJS = @LIBOBJS@
+ LIBRARY_BITNESS = @LIBRARY_BITNESS@
+ LIBS = $(top_builddir)/src/common/libcompat.la \
diff --git a/opensc.spec b/opensc.spec
index 0ef13cb..5678fe8 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,13 +1,13 @@
 Name:           opensc
 Version:        0.12.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensc-project.org/opensc/
 Source0:        http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         opensc-fixdso.patch
 
 BuildRequires:  pcsc-lite-devel
 BuildRequires:  readline-devel
@@ -30,6 +30,8 @@ every software/card that does so, too.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fixdso
+
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure # lib64 rpaths
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
@@ -46,7 +48,6 @@ make %{?_smp_mflags} V=1
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
 # use NEWS file timestamp as reference for configuration file
@@ -62,10 +63,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/opensc
 rm -f $RPM_BUILD_ROOT%{_libdir}/libopensc.so
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -112,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar  4 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.12.2-4
+- Add patch for dso
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list