OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jdepend?expand=0&rev=3

jdepend-2.6.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db6ea27b1e5d89fed53cee443e1a085798fc8a0a7388f1b9c9458c28eb64b9f6
-size 379931

jdepend-2.9.1.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9f34236aaea5ddc070caa29794d2f5ae79bc12e199bec6ebba6c29093a17a9e
+size 280104

jdepend-java14compat.patch

@@ -1,33 +0,0 @@
-diff -Naur ../jdepend-2.6.orig/build.xml ./build.xml
---- ../jdepend-2.6.orig/build.xml	2003-03-21 07:38:58.000000000 +0100
-+++ ./build.xml	2006-09-25 16:23:28.000000000 +0200
-@@ -72,7 +72,8 @@
- 	<target name="compile-src" depends="prepare">
- 
- 		<javac srcdir="${src.dir}" destdir="${build.dir}"
--			debug="${build.debug}" debuglevel="${build.debuglevel}">
-+			debug="${build.debug}" debuglevel="${build.debuglevel}"
-+			source="1.4" target="1.4">
- 			<classpath refid="compile.classpath" />
- 		</javac>
- 
-@@ -82,7 +83,8 @@
- 	<target name="compile-sample" depends="prepare">
- 
- 		<javac srcdir="${sample.dir}" destdir="${build.dir}"
--			debug="${build.debug}" debuglevel="${build.debuglevel}">
-+			debug="${build.debug}" debuglevel="${build.debuglevel}"
-+			source="1.4" target="1.4">
- 			<classpath refid="compile.classpath" />
- 		</javac>
- 
-@@ -92,7 +94,8 @@
- 	<target name="compile-tests" depends="compile-src" if="junit.present">
- 		
- 		<javac srcdir="${tests.dir}" destdir="${build.dir}"
--			debug="${build.debug}" debuglevel="${build.debuglevel}">
-+			debug="${build.debug}" debuglevel="${build.debuglevel}"
-+			source="1.4" target="1.4">
- 			<classpath refid="compile.classpath" />
- 		</javac>
- 	

jdepend.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Mar 14 09:49:46 CET 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 01:46:27 CEST 2007 - ro@suse.de
 

jdepend.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package jdepend (Version 2.6)
+# spec file for package jdepend (Version 2.9.1)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,22 +11,31 @@
 # norootforbuild
 # icecream 0
 
-Name:           jdepend
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-BuildRequires:  ant java2-devel-packages unzip xml-commons-apis
-%define name		jdepend
-%define version		2.6
-%define release		3jpp
 %define section		free
-Version:        2.6
+
-Release:        57
+Name:           jdepend
+Version:        2.9.1
+Release:        1
 Summary:        Java Design Quality Metrics
-License:        BSD License and BSD-like
+License:        BSD 3-Clause
-URL:            http://www.clarkware.com/
+Url:            http://www.clarkware.com/
 Group:          Development/Libraries/Java
 Source0:        %{url}software/%{name}-%{version}.zip
-Patch:          %{name}-java14compat.patch
+BuildRequires:  ant
+%if %defined suse_version
+BuildRequires:  unzip
+BuildRequires:  java-devel
+%endif
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %{gcj_support}
+BuildRequires:  java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 JDepend traverses a set of Java class and source file directories and
@@ -38,9 +47,10 @@ and control package dependencies.
 
 
 %package javadoc
-PreReq:         coreutils
 Summary:        Javadoc for jdepend
 Group:          Development/Libraries/Java
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 JDepend traverses a set of Java class and source file directories and
@@ -71,7 +81,6 @@ This package contains demonstration and sample files for JDepend.
 
 %prep
 %setup -q
-%patch
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 # fix strange permissions
@@ -83,43 +92,84 @@ ant jar javadoc
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+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 docs/api/* $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} # ghost symlink
 rm -rf docs/api
 # demo
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr sample $RPM_BUILD_ROOT%{_datadir}/%{name}
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
+%if %{gcj_support}
+
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+%if %{gcj_support}
+
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
 
 %files
 %defattr(-,root,root)
-%doc README LICENSE docs
+%doc CHANGES README LICENSE
 %{_javadir}/*
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%endif
 
 %files javadoc
 %defattr(-,root,root)
+%doc docs
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %files demo
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
-* Fri Mar 30 2007 - ro@suse.de
+* 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
+* 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
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Thu Jul 28 2005 - jsmeix@suse.de
+* Thu Jul 28 2005 jsmeix@suse.de
 - Adjustments in the spec file.
-* Mon Jul 18 2005 - jsmeix@suse.de
+* Mon Jul 18 2005 jsmeix@suse.de
 - Current version 2.6 from JPackage.org
-* Thu Sep 02 2004 - skh@suse.de
+* Thu Sep 02 2004 skh@suse.de
 - Initial package created with version 2.6 (JPackage 1.5)