rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec, 1.30, 1.31
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jul 18 00:04:17 UTC 2006
Author: mwringe
Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17873
Modified Files:
jakarta-commons-modeler.spec
Log Message:
Added conditional native compiling.
Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jakarta-commons-modeler.spec 12 Jul 2006 06:29:24 -0000 1.30
+++ jakarta-commons-modeler.spec 18 Jul 2006 00:03:59 -0000 1.31
@@ -1,18 +1,53 @@
+# 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 modeler
%define short_name commons-%{base_name}
%define name jakarta-%{short_name}
%define version 1.1
-%define release 4jpp_7fc
+%define release 6jpp_1fc
%define section free
Name: %{name}
Version: %{version}
-Release: %{release}
+Release: %{release}
Epoch: 0
Summary: Jakarta Commons Modeler Package
License: Apache Software License
Group: Development/Libraries/Java
Source0: %{base_name}-%{version}-src.tar.gz
+#Patch: %{name}.no-licence.build.patch
Url: http://jakarta.apache.org/commons/%{base_name}
BuildRequires: ant
BuildRequires: jaxp_parser_impl
@@ -32,13 +67,18 @@
Requires: jakarta-commons-collections >= 0:2.0
Requires: jakarta-commons-digester >= 0:1.2
Requires: jakarta-commons-logging >= 0:1.0
+%if ! %{gcj_support}
+BuildArch: noarch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
-# RHEL3 and FC2
-Obsoletes: %{short_name} <= 0:1.0
-# libgcj aot-compiled native libraries
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+Provides: %{short_name}
+Obsoletes: %{short_name}
+
+%if %{gcj_support}
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
%description
The Modeler project shall create and maintain a set of Java
@@ -49,13 +89,13 @@
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
-Prereq: coreutils
%description javadoc
Javadoc for %{name}.
%prep
-%setup -q -n %{short_name}-%{version}-src
+%setup -n %{short_name}-%{version}-src
+#%%patch
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
@@ -74,27 +114,13 @@
%__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
%clean
%__rm -rf %{buildroot}
-%pre
-rm -f %{_javadir}/%{short_name}*.jar
-rm -f %{_javadir}/%{name}*.jar
-
-%triggerpostun -- commons-modeler < 1.2
-pushd %{_javadir} &> /dev/null
- ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar
- ln -sf %{short_name}-%{version}.jar %{short_name}.jar
-popd &> /dev/null
-
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
%post javadoc
%__rm -f %{_javadocdir}/%{name}
%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
@@ -104,11 +130,30 @@
%__rm -f %{_javadocdir}/%{name}
fi
+%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 STATUS.html RELEASE-NOTES.txt PROPOSAL.html
%{_javadir}/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-modeler-1.1.jar.*
+%endif
%files javadoc
%defattr(0644,root,root,0755)
@@ -117,66 +162,20 @@
%ghost %dir %{_javadocdir}/%{name}
%changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1-4jpp_7fc
-- rebuild
+* Mon Jul 17 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-6jpp_1fc
+- Added contional native compilation.
+- Merge with upstream version.
-* Mon Mar 6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.1-4jpp_6fc
-- stop scriptlet spew
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1-4jpp_5fc
-- bump again for double-long bug on ppc(64)
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.1-4jpp_4fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.1-4jpp_3fc
-- rebuilt
-
-* Wed Jul 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-4jpp_2fc
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm.
-
-* Thu May 26 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-4jpp_1fc
-- Upgrade to 1.1-4jpp.
-- Rearrange how BC-compiled stuff is built and installed.
-
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-3jpp_4fc
-- Add alpha to the list of build architectures (#157522).
-- Use absolute paths for rebuild-gcj-db.
-
-* Thu May 5 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-3jpp_3fc
-- Add dependencies for %post and %postun scriptlets (#156901).
-
-* Wed May 4 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-3jpp_2fc
-- BC-compile.
-
-* Mon Mar 7 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-3jpp_1fc
-- Build into Fedora.
+* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.1-5jpp
+- First JPP 1.7 build
* Thu Feb 24 2005 David Walluck <david at jpackage.org> 0:1.1-4jpp
- add missing epochs to dependencies
- add non-versioned javadoc symlink
- fix file permissions
-* Fri Oct 22 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.1-3jpp_1rh
-- Merge with upstream version
-
* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.1-3jpp
- Rebuild with ant-1.6.2
-
-* Fri Jul 2 2004 Aizaz Ahmed <aahmed at redhat.com> 0:1.1-2jpp_4rh
-- Added trigger to restore symlinks that are removed if ugrading
- from a commons-modeler rhug package
-
-* Fri Apr 2 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.1-2jpp_3rh
-- more of the same, for version-suffixed .jar files
-
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.1-2jpp_2rh
-- add RHUG upgrade cleanup
-
-* Thu Mar 4 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.1-2jpp_1rh
-- RH vacuuming
-
* Thu Oct 09 2003 Henri Gomez <hgomez at users.sourceforge.net> 0:1.1-2jpp
- fix junit typo (reported by Kaj J. Niemi)
More information about the fedora-cvs-commits
mailing list