Merge with upstream version Natively compile packages

jdepend.spec

@@ -1,21 +1,60 @@
-%define name		jdepend
+# Copyright (c) 2000-2005, JPackage Project
-%define version		2.6
+# All rights reserved.
-%define release 2jpp_4fc.1.1
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		free
 
-Name:		%{name}
+Name:		jdepend
-Version:	%{version}
+Version:	2.6
-Release: %{release}.1.1
+Release:	5jpp_1fc
 Epoch:		0
 Summary:        Java Design Quality Metrics
 License:        Clarkware License
 Url:            http://www.clarkware.com/
 Group:          Development/Libraries/Java
-Source0:        %{name}-%{version}-RHCLEAN.zip
+Source0:        %{url}software/%{name}-%{version}-RHCLEAN.zip
 BuildRequires:  ant
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
 
+%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
 generates design quality metrics for each Java package. JDepend allows
@@ -62,14 +101,38 @@ rm -rf docs/api
 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
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %doc README LICENSE docs
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jdepend-2.6.jar.*
+%endif
+
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
@@ -79,23 +142,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:2.6-2jpp_4fc.1.1.1.1
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:2.6-5jpp_1fc
-- rebuild
+- Merge with upstream version
+- Natively compile packages
 
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:2.6-5jpp
-- rebuilt
+- Add conditional native compiling
 
-* Wed Jun 22 2005 Gary Benson <gbenson@redhat.com> 0:2.6-2jpp_4fc
+* Wed May 17 2006 Fernando Nasser <fnasser@redhat.com> - 0:2.6-4jpp
-- Remove jarfile from the tarball.
+- First JPP 1.7 build
 
-* Tue Jan 11 2005 Gary Benson <gbenson@redhat.com> 0:2.6-2jpp_3fc
+* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:2.6-3jpp
-- Reenable building of classes that require javax.swing (#130006).
+- Rebuild with ant-1.6.2
-
-* Wed Nov  3 2004 Gary Benson <gbenson@redhat.com> 0:2.6-2jpp_2fc
-- Build into Fedora.
-
-* Thu Mar  4 2004 Frank Ch. Eigler <fche@redhat.com> 0:2.6-2jpp_1rh
-- RH vacuuming
 
 * Fri Apr 11 2003 David Walluck <david@anti-microsoft.org> 0:2.6-2jpp
 - fix strange permissions