From 3763787140688c356faac92636bcb23df7095c465b21f296a4ac53da546e7148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 6 Mar 2017 12:39:07 +0000 Subject: [PATCH] Accepting request 477197 from home:stfnknorr:branches:Java:packages Switch between maven-metadata/maven-fragments as appropriat for SLE/openSUSE (FATE#322405) OBS-URL: https://build.opensuse.org/request/show/477197 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-pdfbox?expand=0&rev=5 --- apache-pdfbox.changes | 6 ++++++ apache-pdfbox.spec | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/apache-pdfbox.changes b/apache-pdfbox.changes index 3f53507..1f5946c 100644 --- a/apache-pdfbox.changes +++ b/apache-pdfbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 6 10:06:14 UTC 2017 - sknorr@suse.com + +- Switch between maven-metadata/maven-fragments as appropriate + for SLE/openSUSE (FATE#322405) + ------------------------------------------------------------------- Thu Jun 16 08:43:53 UTC 2016 - fvogt@suse.com diff --git a/apache-pdfbox.spec b/apache-pdfbox.spec index afef889..a5a8113 100644 --- a/apache-pdfbox.spec +++ b/apache-pdfbox.spec @@ -1,7 +1,7 @@ # # spec file for package apache-pdfbox # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -107,6 +107,10 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} %{_javadir}/jempbox.jar %{_mavenpomdir}/JPP-fontbox.pom %{_mavenpomdir}/JPP-jempbox.pom -%{_datadir}/maven-metadata/%{name}.xml +%if %suse_version >= 1330 +%{_datadir}/maven-metadata/%{name}.xml* +%else +%{_mavendepmapfragdir}/%{name} +%endif %changelog