[java-1.7.0-openjdk/f20] removed source14 remove-origin-from-rpaths (11690970) - removed build requirement for chrpath

[jiri vanek]

commit 58ec80fb25bbb9404c9efaf10f807d3e28be22c7
Author: Jiri Vanek <jvanek at redhat.com>
Date:   Tue Dec 2 14:04:51 2014 +0100

    removed source14 remove-origin-from-rpaths (11690970)
    - removed build requirement for chrpath

 java-1.7.0-openjdk.spec   |   13 +++-----
 remove-origin-from-rpaths |   71 ---------------------------------------------
 2 files changed, 5 insertions(+), 79 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index f338326..64abb30 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -177,7 +177,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: %{icedtea_version}.0%{?dist}
+Release: %{icedtea_version}.1%{?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
@@ -249,9 +249,6 @@ Source12: TestCryptoLevel.java
 
 Source13: java-abrt-luncher
 
-# Remove $ORIGIN from RPATHS
-Source14: remove-origin-from-rpaths
-
 # RPM/distribution specific patches
 
 # Allow TCK to pass with access bridge wired in
@@ -305,7 +302,6 @@ BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gcc-c++
 BuildRequires: alsa-lib-devel
-BuildRequires: chrpath
 BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 BuildRequires: giflib-devel
@@ -730,9 +726,6 @@ rm -f %{buildoutputdir}/lib/fontconfig*.bfc
 $JAVA_HOME/bin/javac -d . %{SOURCE12}
 $JAVA_HOME/bin/java TestCryptoLevel
 
-files=$(find $(pwd)/%{buildoutputdir}/j2sdk-image/ -type f | xargs file | grep ELF | cut -d: -f1)
-python %{SOURCE14} $files
-
 %install
 rm -rf $RPM_BUILD_ROOT
 STRIP_KEEP_SYMTAB=libjvm*
@@ -1570,6 +1563,10 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Mon Dec 01 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.7.0.71-2.5.3.1
+- removed source14 remove-origin-from-rpaths (11690970)
+- removed build requirement for chrpath
+
 * Wed Oct 15 2014 Jiri Vanek  <jvanek at redhat.com> - 1.7.0.71-2.5.3.0
 - updated to security icedtea-forest 2.5.3