add patch for dso

This commit is contained in:
Peter Robinson 2012-03-04 11:41:10 +00:00
parent 6f52b0b53f
commit 54444266c6
2 changed files with 18 additions and 7 deletions

11
opensc-fixdso.patch Normal file
View File

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

View File

@ -1,13 +1,13 @@
Name: opensc Name: opensc
Version: 0.12.2 Version: 0.12.2
Release: 3%{?dist} Release: 4%{?dist}
Summary: Smart card library and applications Summary: Smart card library and applications
Group: System Environment/Libraries Group: System Environment/Libraries
License: LGPLv2+ License: LGPLv2+
URL: http://www.opensc-project.org/opensc/ URL: http://www.opensc-project.org/opensc/
Source0: http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz 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: pcsc-lite-devel
BuildRequires: readline-devel BuildRequires: readline-devel
@ -30,6 +30,8 @@ every software/card that does so, too.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .fixdso
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure # lib64 rpaths sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure # lib64 rpaths
cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/pkcs15init/README ./README.pkcs15init
cp -p src/scconf/README.scconf . cp -p src/scconf/README.scconf .
@ -46,7 +48,6 @@ make %{?_smp_mflags} V=1
%install %install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
# use NEWS file timestamp as reference for configuration file # 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 rm -f $RPM_BUILD_ROOT%{_libdir}/libopensc.so
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
@ -112,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sun Mar 4 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 0.12.2-4
- Add patch for dso
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.2-3 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild