Attachment 917099 Details for Bug 1111349 – Proposed fix for F20 spec.

[patch] Proposed fix for F20 spec.

0001-Fix-file-ownership.patch (text/plain), 3.55 KB, created by Severin Gehwolf on 2014-07-10 13:59:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Severin Gehwolf

Created: 2014-07-10 13:59:17 UTC

Size: 3.55 KB

patch

obsolete

>From 04ab871db72376a33aa0547767de8c093814db61 Mon Sep 17 00:00:00 2001
>From: Severin Gehwolf <sgehwolf@redhat.com>
>Date: Thu, 10 Jul 2014 14:51:28 +0200
>Subject: [PATCH] Fix file ownership.
>
>- Resolves RHBZ#1111349.
>---
> java-1.7.0-openjdk.spec | 23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
>diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
>index a60f13e..f60ed83 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
>@@ -361,7 +361,6 @@ Requires: fontconfig
> Requires: xorg-x11-fonts-Type1
> #requires rest of java
> Requires: %{name}-headless = %{epoch}:%{version}-%{release}
>-OrderWithRequires: %{name}-headless = %{epoch}:%{version}-%{release}
> 
> 
> # Standard JPackage base provides.
>@@ -429,8 +428,8 @@ Summary: OpenJDK Development Environment
> Group:   Development/Tools
> 
> # Require base package.
>-Requires:         %{name} = %{epoch}:%{version}-%{release}
>-OrderWithRequires: %{name}-headless = %{epoch}:%{version}-%{release}
>+Requires: %{name}          = %{epoch}:%{version}-%{release}
>+Requires: %{name}-headless = %{epoch}:%{version}-%{release}
> # Post requires alternatives to install tool alternatives.
> Requires(post):   %{_sbindir}/alternatives
> # Postun requires alternatives to uninstall tool alternatives.
>@@ -453,8 +452,8 @@ The OpenJDK development tools.
> Summary: OpenJDK Demos
> Group:   Development/Languages
> 
>-Requires: %{name} = %{epoch}:%{version}-%{release}
>-OrderWithRequires: %{name}-headless = %{epoch}:%{version}-%{release}
>+Requires: %{name}          = %{epoch}:%{version}-%{release}
>+Requires: %{name}-headless = %{epoch}:%{version}-%{release}
> 
> %description demo
> The OpenJDK demos.
>@@ -463,7 +462,8 @@ The OpenJDK demos.
> Summary: OpenJDK Source Bundle
> Group:   Development/Languages
> 
>-Requires: %{name} = %{epoch}:%{version}-%{release}
>+Requires: %{name}          = %{epoch}:%{version}-%{release}
>+Requires: %{name}-headless = %{epoch}:%{version}-%{release}
> 
> %description src
> The OpenJDK source bundle.
>@@ -474,7 +474,6 @@ Group:   Documentation
> Requires: jpackage-utils
> BuildArch: noarch
> 
>-OrderWithRequires: %{name}-headless = %{epoch}:%{version}-%{release}
> # Post requires alternatives to install javadoc alternative.
> Requires(post):   %{_sbindir}/alternatives
> # Postun requires alternatives to uninstall javadoc alternative.
>@@ -490,8 +489,8 @@ The OpenJDK API documentation.
> %package accessibility
> Summary: OpenJDK accessibility connector
> Requires: java-atk-wrapper
>-Requires: %{name} = %{epoch}:%{version}-%{release}
>-OrderWithRequires: %{name}-headless = %{epoch}:%{version}-%{release}
>+Requires: %{name}          = %{epoch}:%{version}-%{release}
>+Requires: %{name}-headless = %{epoch}:%{version}-%{release}
> 
> %description accessibility
> Enables accessibility support in OpenJDK by using java-at-wrapper. This allows compatible at-spi2 based accessibility programs to work for AWT and Swing-based programs.
>@@ -1565,6 +1564,10 @@ exit 0
> %{_jvmdir}/%{jredir}/lib/accessibility.properties
> 
> %changelog
>+* Thu Jul 10 2014 Severin Gehwolf <sgehwolf@redhat.com> - 1.7.0.60-2.5.0.4
>+- Fix file ownership.
>+- Resolves RHBZ#1111349.
>+
> * Wed Jul 02 2014 Jiri Vanek  <jvanek@redhat.com> - 1.7.0.60-2.5.0.3
> - Added arrch64 support
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1111349: 917099