rpms/jakarta-commons-launcher/devel jakarta-commons-launcher.spec, 1.11, 1.12

Thu Jul 20 22:47:28 UTC 2006

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-launcher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23727

Modified Files:
	jakarta-commons-launcher.spec 
Log Message:
- Merge with upstream version
- Natively compile packages



Index: jakarta-commons-launcher.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-launcher/devel/jakarta-commons-launcher.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12

--- jakarta-commons-launcher.spec	12 Jul 2006 06:29:07 -0000	1.11
+++ jakarta-commons-launcher.spec	20 Jul 2006 22:47:25 -0000	1.12
@@ -1,3 +1,37 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# 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 base_name       launcher
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
@@ -5,20 +39,26 @@
 
 Name:           %{name}
 Version:        0.9
-Release: 	3jpp_4fc
+Release:        5jpp_1fc
 Epoch:          0
 Summary:        The Launcher Component is designed to be a cross platform Java application launcher.
 License:        Apache Software License
 Group:          Development/Libraries/Java
-#Vendor:         JPackage Project
-#Distribution:   JPackage
 URL:            http://jakarta.apache.org/commons/launcher/
 Source:         http://archive.apache.org/dist/jakarta/commons/launcher/source/launcher-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5.30
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Commons-launcher eliminates the need for a batch or shell script to launch a Java class. Some situations where elimination of a batch or shell script may be desirable are:
 
@@ -34,7 +74,6 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -69,6 +108,10 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,11 +121,31 @@
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
 
+%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(0644,root,root,0755)
 %doc LICENSE.txt STATUS.html
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-launcher-0.9.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
@@ -90,30 +153,20 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9-3jpp_4fc
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:0.9-3jpp_3fc
-- stop scriptlet spew
-
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com> - 0:0.9-3jpp_2fc
-- rebuilt for new gcj
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:0.9-5jpp_1fc
+- Merge with upstream version
+- Natively compile packages
+
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:0.9-5jpp
+- Add conditional native compiling
+- Change section from 'devel' to 'free'
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:0.9-3jpp_1fc
-- Build into Fedora.
-
-* Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:0.9-3jpp_1rh
-- Merge with upstream
+* Thu Apr 27 2006 Fernando Nasser <fnasser at redhat.com> - 0:0.9-4jpp
+- First JPP 1.7 build
 
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:0.9-3jpp
 - Rebuild with ant-1.6.2
 
-* Wed Jul 14 2004 Fernando Nasser <fnasser at redhat.com> - 0:0.9-2jpp_1rh
-- Merge with upstream to remove dependency on ant-optional
-
 * Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:0.9-2jpp
 - Upgrade to Ant 1.6.X
 


