- build against libassuan1 (f14+)
This commit is contained in:
parent
b5436d174b
commit
6350e581c2
12
opensc-0.11.13-libassuan1.patch
Normal file
12
opensc-0.11.13-libassuan1.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up opensc-0.11.13/aclocal.m4.libassuan1 opensc-0.11.13/aclocal.m4
|
||||||
|
--- opensc-0.11.13/aclocal.m4.libassuan1 2010-02-16 03:32:15.000000000 -0600
|
||||||
|
+++ opensc-0.11.13/aclocal.m4 2010-08-11 13:39:21.483606389 -0500
|
||||||
|
@@ -1108,7 +1108,7 @@ AC_SUBST([am__untar])
|
||||||
|
]) # _AM_PROG_TAR
|
||||||
|
|
||||||
|
m4_include([m4/acx_pthread.m4])
|
||||||
|
-m4_include([m4/libassuan.m4])
|
||||||
|
+m4_include([libassuan1.m4])
|
||||||
|
m4_include([m4/libtool.m4])
|
||||||
|
m4_include([m4/ltoptions.m4])
|
||||||
|
m4_include([m4/ltsugar.m4])
|
19
opensc.spec
19
opensc.spec
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: opensc
|
Name: opensc
|
||||||
Version: 0.11.13
|
Version: 0.11.13
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Smart card library and applications
|
Summary: Smart card library and applications
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -11,6 +11,7 @@ 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
|
||||||
Patch1: %{name}-0.11.7-develconfig.patch
|
Patch1: %{name}-0.11.7-develconfig.patch
|
||||||
Patch2: %{name}-0.11.12-no-add-needed.patch
|
Patch2: %{name}-0.11.12-no-add-needed.patch
|
||||||
|
Patch3: opensc-0.11.13-libassuan1.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: pcsc-lite-devel
|
BuildRequires: pcsc-lite-devel
|
||||||
@ -33,7 +34,11 @@ eID cards have also been confirmed to work.
|
|||||||
Summary: Digital signature plugin for web browsers
|
Summary: Digital signature plugin for web browsers
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
BuildRequires: libXt-devel
|
BuildRequires: libXt-devel
|
||||||
BuildRequires: libassuan-static, libassuan-devel
|
%if 0%{?fedora} > 13
|
||||||
|
BuildRequires: libassuan1-devel libassuan1-static automake
|
||||||
|
%else
|
||||||
|
BuildRequires: libassuan-devel libassuan-static
|
||||||
|
%endif
|
||||||
Requires: mozilla-filesystem%{?_isa}
|
Requires: mozilla-filesystem%{?_isa}
|
||||||
Requires: pinentry-gui
|
Requires: pinentry-gui
|
||||||
|
|
||||||
@ -62,6 +67,13 @@ cp -p src/scconf/README.scconf .
|
|||||||
# No %{_libdir} here to avoid multilib conflicts; it's just an example
|
# 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
|
sed -i -e 's|/usr/local/towitoko/lib/|/usr/lib/ctapi/|' etc/opensc.conf.in
|
||||||
|
|
||||||
|
# hacks for libassuan1
|
||||||
|
%if 0%{?fedora} > 13
|
||||||
|
rm -f m4/libassuan.m4
|
||||||
|
%patch3 -p1 -b .libassuan1
|
||||||
|
./bootstrap
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static \
|
%configure --disable-static \
|
||||||
@ -156,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 11 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.11.13-3
|
||||||
|
- build against libassuan1 (f14+)
|
||||||
|
|
||||||
* Wed Jun 9 2010 Tomas Mraz <tmraz@redhat.com> - 0.11.13-2
|
* Wed Jun 9 2010 Tomas Mraz <tmraz@redhat.com> - 0.11.13-2
|
||||||
- replace file dependency (#601943)
|
- replace file dependency (#601943)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user