From d89aa4fc015a36e54f3698a63b697d2ae131070a7ad5f0bc2c0dbe1295528ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 11 Sep 2017 11:58:40 +0000 Subject: [PATCH] Accepting request 523085 from home:dimstar:Factory Variant to what Fridrich submitted, but less restrictive OBS-URL: https://build.opensuse.org/request/show/523085 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libbluray?expand=0&rev=64 --- libbluray.changes | 6 ++++++ libbluray.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libbluray.changes b/libbluray.changes index 268a2cb..b83f8f7 100644 --- a/libbluray.changes +++ b/libbluray.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 10 14:02:16 UTC 2017 - dimstar@opensuse.org + +- BuildConflict with java-devel >= 1.9. Java 8 is the last to + support source_version 1.5. + ------------------------------------------------------------------- Thu Jun 15 09:33:42 UTC 2017 - joerg.lorenzen@ki.tng.de diff --git a/libbluray.spec b/libbluray.spec index 08a8ca0..6aac1cf 100644 --- a/libbluray.spec +++ b/libbluray.spec @@ -31,11 +31,11 @@ Patch2: libbluray-jvm_dir.patch BuildRequires: ant BuildRequires: java-devel >= 1.6 BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(libxml-2.0) >= 2.6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildConflicts: java-devel >= 1.9 %description This library is written for the purpose of playing Blu-ray movies. It is