- Do not use versioned javadoc dir.

OBS-URL: https://build.opensuse.org/package/show/Java:packages/relaxngDatatype?expand=0&rev=6
This commit is contained in:
Tomáš Chvátal 2014-07-11 14:48:35 +00:00 committed by Git OBS Bridge
parent ffd87a2089
commit e37ee4e87a
2 changed files with 14 additions and 23 deletions

View File

@ -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 Mon Sep 9 11:06:18 UTC 2013 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package relaxngDatatype # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,31 +16,25 @@
# #
%define section free
Name: relaxngDatatype Name: relaxngDatatype
Version: 1.0 Version: 1.0
Release: 0 Release: 0
Summary: RELAX NG Datatype API Summary: RELAX NG Datatype API
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Languages/Java Group: Development/Languages/Java
# Note, this project is currently unmaintaned
Url: https://sourceforge.net/projects/relaxng Url: https://sourceforge.net/projects/relaxng
Source0: relaxngDatatype-1.0.tar.bz2 Source0: relaxngDatatype-1.0.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
#Obsoletes: msv BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description %description
RELAX NG is a public space for test cases and other ancillary software RELAX NG is a public space for test cases and other ancillary software
related to the construction of the RELAX NG language and its related to the construction of the RELAX NG language and its
implementations. implementations.
%package javadoc %package javadoc
Summary: RELAX NG Datatype API Summary: RELAX NG Datatype API
Group: Development/Languages/Java 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 related to the construction of the RELAX NG language and its
implementations. implementations.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q
# wrong end of line necoding # wrong end of line necoding
sed -i -e 's/.$//' copying.txt 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
install -Dpm 644 %{name}.jar \ install -Dpm 644 %{name}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# #
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}
ln -sf %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
#
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -80,7 +67,6 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc %files javadoc
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog %changelog