From 527ec10c59c4b8512e7aaa321eb9c26d23c8d521ab1f14666f6522f40e46b1b8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 10 Jun 2017 16:33:05 +0000 Subject: [PATCH] Accepting request 502548 from Java:packages - Drop javadoc so we build with gcj properly OBS-URL: https://build.opensuse.org/request/show/502548 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jdepend?expand=0&rev=16 --- jdepend.changes | 5 +++ jdepend.spec | 85 +++++++------------------------------------------ 2 files changed, 17 insertions(+), 73 deletions(-) diff --git a/jdepend.changes b/jdepend.changes index 90daac5..25f7ce2 100644 --- a/jdepend.changes +++ b/jdepend.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 9 10:17:28 UTC 2017 - tchvatal@suse.com + +- Drop javadoc so we build with gcj properly + ------------------------------------------------------------------- Fri Aug 29 13:26:09 CEST 2008 - mvyskocil@suse.cz diff --git a/jdepend.spec b/jdepend.spec index 78c5027..282d4c5 100644 --- a/jdepend.spec +++ b/jdepend.spec @@ -1,7 +1,7 @@ # -# spec file for package jdepend (Version 2.9.1) +# spec file for package jdepend # -# Copyright (c) 2008 SUSE LINUX Products 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 @@ -15,24 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -# icecream 0 %define section free - Name: jdepend Version: 2.9.1 -Release: 72 +Release: 0 Summary: Java Design Quality Metrics License: BSD-3-Clause -Url: http://www.clarkware.com/ Group: Development/Libraries/Java +Url: http://www.clarkware.com/ Source0: %{url}software/%{name}-%{version}.tar.bz2 Patch0: jdepend-target15.patch BuildRequires: ant BuildRequires: java-devel -BuildArch: noarch +Obsoletes: %{name}-javadoc BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description JDepend traverses a set of Java class and source file directories and @@ -41,26 +39,7 @@ you to automatically measure the quality of a design in terms of its extensibility, reusability, and maintainability to effectively manage and control package dependencies. - - -%package javadoc -License: BSD-3-Clause -Summary: Javadoc for jdepend -Group: Development/Libraries/Java - -%description javadoc -JDepend traverses a set of Java class and source file directories and -generates design quality metrics for each Java package. JDepend allows -you to automatically measure the quality of a design in terms of its -extensibility, reusability, and maintainability to effectively manage -and control package dependencies. - -This package contains the javadoc documentation for JDepend. - - - %package demo -License: BSD-3-Clause Summary: Demonstration and sample files for jdepend Group: Development/Libraries/Java Requires: %{name} = %{version}-%{release} @@ -74,8 +53,6 @@ and control package dependencies. This package contains demonstration and sample files for JDepend. - - %prep %setup -q # remove all binary libs @@ -85,63 +62,25 @@ find . -type d -exec chmod 755 {} \; %patch0 -b .target15 %build -ant jar javadoc +ant jar %install # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +install -d -m 755 %{buildroot}%{_javadir} install -m 644 dist/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} -rm -rf docs/api + %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) # demo -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -pr sample $RPM_BUILD_ROOT%{_datadir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT +install -d -m 755 %{buildroot}%{_datadir}/%{name} +cp -pr sample %{buildroot}%{_datadir}/%{name} %files %defattr(-,root,root) %doc CHANGES README LICENSE %{_javadir}/* -%files javadoc -%defattr(-,root,root) -%doc docs -%{_javadocdir}/%{name}-%{version} -%doc %{_javadocdir}/%{name} - %files demo %defattr(-,root,root) %{_datadir}/%{name} %changelog -* Fri Aug 29 2008 mvyskocil@suse.cz -- source=1.5 -target=1.5 -- bzipped source code -- removed the gcj support -- removed a javadoc scripplets -* Fri Mar 14 2008 mvyskocil@suse.cz -- merged with jpackage 1.7: -- update to version 2.9.1 -- removed a java14compat patch -- added a gcj build support -- added post(un) scripts for javadoc subpackage -* Fri Mar 30 2007 ro@suse.de -- added unzip to buildreq -* Mon Sep 25 2006 skh@suse.de -- don't use icecream -- use source="1.4" and target="1.4" for build with java 1.5 -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Thu Jul 28 2005 jsmeix@suse.de -- Adjustments in the spec file. -* Mon Jul 18 2005 jsmeix@suse.de -- Current version 2.6 from JPackage.org -* Thu Sep 02 2004 skh@suse.de -- Initial package created with version 2.6 (JPackage 1.5)