From e37ee4e87a4796d0a1c905daaabfb3e92103870013739f7308e5c1b66f48bc5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 11 Jul 2014 14:48:35 +0000
Subject: [PATCH] - Do not use versioned javadoc dir.

OBS-URL: https://build.opensuse.org/package/show/Java:packages/relaxngDatatype?expand=0&rev=6
---
 relaxngDatatype.changes |  5 +++++
 relaxngDatatype.spec    | 32 +++++++++-----------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/relaxngDatatype.changes b/relaxngDatatype.changes
index 6e3a742..12215ad 100644
--- a/relaxngDatatype.changes
+++ b/relaxngDatatype.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 11 14:48:26 UTC 2014 - tchvatal@suse.com
+
+- Do not use versioned javadoc dir.
+
 -------------------------------------------------------------------
 Mon Sep  9 11:06:18 UTC 2013 - tchvatal@suse.com
 
diff --git a/relaxngDatatype.spec b/relaxngDatatype.spec
index 0d707cb..4d5ea45 100644
--- a/relaxngDatatype.spec
+++ b/relaxngDatatype.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package relaxngDatatype
 #
-# 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
@@ -16,31 +16,25 @@
 #
 
 
-%define section   free
-
 Name:           relaxngDatatype
 Version:        1.0
 Release:        0
 Summary:        RELAX NG Datatype API
 License:        BSD-3-Clause
 Group:          Development/Languages/Java
-# Note, this project is currently unmaintaned
 Url:            https://sourceforge.net/projects/relaxng
 Source0:        relaxngDatatype-1.0.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
 BuildRequires:  ant
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
-#Obsoletes:      msv
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 RELAX NG is a public space for test cases and other ancillary software
 related to the construction of the RELAX NG language and its
 implementations.
 
-
-
 %package        javadoc
 Summary:        RELAX NG Datatype API
 Group:          Development/Languages/Java
@@ -50,10 +44,8 @@ RELAX NG is a public space for test cases and other ancillary software
 related to the construction of the RELAX NG language and its
 implementations.
 
-
-
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 # wrong end of line necoding
 sed -i -e 's/.$//' copying.txt
 
@@ -62,16 +54,11 @@ ant -Dbuild.sysclasspath=only -Dant.build.javac.source=1.4 -Dant.build.javac.tar
 
 %install
 install -Dpm 644 %{name}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+  %{buildroot}%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 #
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -sf %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-#
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %defattr(-,root,root,-)
@@ -80,7 +67,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
 
 %changelog