Attachment 917709 Details for Bug 1119204 – Proposed spec-file patch

[patch] Proposed spec-file patch

0001-Use-system-PCSC-libraries-over-in-tree-version.patch (text/plain), 2.47 KB, created by Severin Gehwolf on 2014-07-14 09:21:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Severin Gehwolf

Created: 2014-07-14 09:21:40 UTC

Size: 2.47 KB

patch

obsolete

>From 489776e85dc45ffc6df080d374b2e5268fed63c1 Mon Sep 17 00:00:00 2001
>From: Severin Gehwolf <sgehwolf@redhat.com>
>Date: Fri, 11 Jul 2014 18:28:20 +0200
>Subject: [PATCH] Use system PCSC libraries over in-tree version.
>
>---
> java-1.7.0-openjdk.spec    | 8 +++++++-
> remove-intree-libraries.sh | 4 ++++
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
>diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
>index a60f13e..498a1a8 100644
>--- a/java-1.7.0-openjdk.spec
>+++ b/java-1.7.0-openjdk.spec
>@@ -172,7 +172,7 @@
> 
> Name:    java-%{javaver}-%{origin}
> Version: %{javaver}.%{updatever}
>-Release: %{icedtea_version}.3%{?dist}
>+Release: %{icedtea_version}.4%{?dist}
> # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
> # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
> # also included the epoch in their virtual provides.  This created a
>@@ -336,6 +336,8 @@ BuildRequires: libattr-devel
> # Build requirements for SunEC system NSS support
> BuildRequires: nss-softokn-freebl-devel >= 3.16.1
> BuildRequires: python
>+# Requirements for using system PCSC libs
>+BuildRequires: pcsc-lite-devel
> # PulseAudio build requirements.
> %if %{with_pulseaudio}
> BuildRequires: pulseaudio-libs-devel >= 0.9.11
>@@ -679,6 +681,7 @@ make \
>   JAVAC_WARNINGS_FATAL="false" \
>   INSTALL_LOCATION=%{_jvmdir}/%{sdkdir} \
>   SYSTEM_NSS="true" \
>+  SYSTEM_PCSC="true" \
>   NSS_LIBS="`pkg-config --libs nss-softokn` -lfreebl" \
>   NSS_CFLAGS="`pkg-config --cflags nss-softokn` " \
>   ECC_JUST_SUITE_B="true" \
>@@ -1565,6 +1568,9 @@ exit 0
> %{_jvmdir}/%{jredir}/lib/accessibility.properties
> 
> %changelog
>+* Fri Jul 11 2014 Severin Gehwolf <sgehwolf@redhat.com> - 1.7.0.60-2.5.0.4
>+- Use system PCSC libraries over in-tree version.
>+
> * Wed Jul 02 2014 Jiri Vanek  <jvanek@redhat.com> - 1.7.0.60-2.5.0.3
> - Added arrch64 support
> 
>diff --git a/remove-intree-libraries.sh b/remove-intree-libraries.sh
>index 237049a..4247dee 100644
>--- a/remove-intree-libraries.sh
>+++ b/remove-intree-libraries.sh
>@@ -4,6 +4,7 @@ ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-*
> JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeg-6b
> GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib
> PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng
>+PCSC_SRC=openjdk/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
> 
> echo "Removing built-in libs (they will be linked)"
> 
>@@ -80,3 +81,6 @@ if [ ! -d ${PNG_SRC} ]; then
> fi	
> rm -rvf ${PNG_SRC}
> 
>+echo "Removing libpcsc headers"
>+rm -rvf ${PCSC_SRC}
>+
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1119204: 917709