From b3a3f4063db4119308b6369c62c5c51fae7d6759dd03235b462d7488c5122c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 11 Jul 2014 13:50:23 +0000 Subject: [PATCH] - Do not version java docdir. OBS-URL: https://build.opensuse.org/package/show/Java:packages/xpp3?expand=0&rev=6 --- xpp3.changes | 5 +++++ xpp3.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xpp3.changes b/xpp3.changes index 5188c7e..8dded9e 100644 --- a/xpp3.changes +++ b/xpp3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 11 13:50:12 UTC 2014 - tchvatal@suse.com + +- Do not version java docdir. + ------------------------------------------------------------------- Mon Sep 9 11:06:31 UTC 2013 - tchvatal@suse.com diff --git a/xpp3.spec b/xpp3.spec index 9ea5252..41742cc 100644 --- a/xpp3.spec +++ b/xpp3.spec @@ -1,7 +1,7 @@ # # spec file for package xpp3 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -89,8 +89,8 @@ cp -p build/%{name}_xpath-%{oversion}.jar \ $RPM_BUILD_ROOT%{_javadir}/%{name}-xpath-%{version}.jar (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} rm -rf doc/{build.txt,api} %clean @@ -111,6 +111,6 @@ rm -rf $RPM_BUILD_ROOT %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} %changelog