rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 1.29, 1.30
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 17 22:18:25 UTC 2006
Author: mwringe
Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv773
Modified Files:
jakarta-commons-digester.spec
Log Message:
Added conditional native compiling.
Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jakarta-commons-digester.spec 12 Jul 2006 06:28:22 -0000 1.29
+++ jakarta-commons-digester.spec 17 Jul 2006 22:18:22 -0000 1.30
@@ -1,13 +1,47 @@
+# 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 digester
%define short_name commons-%{base_name}
%define name jakarta-%{short_name}
%define version 1.7
-%define release 2jpp_10fc.1
+%define release 3jpp_1fc
%define section free
Name: %{name}
Version: %{version}
-Release: %{release}
+Release: %{release}
Epoch: 0
Summary: Jakarta Commons Digester Package
License: Apache Software License
@@ -20,13 +54,18 @@
BuildRequires: jpackage-utils > 0:1.5
Requires: jakarta-commons-beanutils >= 0:1.7
Requires: jakarta-commons-logging >= 0:1.0
+%if ! %{gcj_support}
+BuildArch: noarch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-# RHEL3 and FC2
-Obsoletes: %{short_name} <= 1.4.1
-# 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 goal of Digester project is to create and maintain a XML -> Java
@@ -36,7 +75,6 @@
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
-Prereq: coreutils
%description javadoc
Javadoc for %{name}.
@@ -70,27 +108,13 @@
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
-%pre
-rm -f %{_javadir}/%{short_name}*.jar
-rm -f %{_javadir}/%{name}*.jar
-
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
-%triggerpostun -- commons-digester < 1.5
-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 javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -100,80 +124,55 @@
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 LICENSE.txt RELEASE-NOTES.txt
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-digester-1.7-rss.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-digester-1.7.jar.*
+%endif
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.7-2jpp_10fc.1
-- rebuild
-
-* Mon Mar 6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.7-2jpp_10fc
-- stop scriptlet spew
-
-* Tue Feb 21 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.7-2jpp_9fc
-- Updated to version 1.7.
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com>
-- bump again for double-long bug on ppc(64)
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.6-2jpp_7fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_6fc
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm (also BC-compiles rss jarfile).
-
-* Wed May 25 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_5fc
-- Rearrange how BC-compiled stuff is built and installed.
+* Mon Jul 17 2006 Matt Wringe <mwringe at redhat.com> - 0:1.7-3jpp_1fc
+- Added conditional native compiling
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_4fc
-- Add alpha to the list of build architectures (#157522).
-- Use absolute paths for rebuild-gcj-db.
+* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7-2jpp
+- First JPP 1.7 build
-* Thu May 5 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_3fc
-- Add dependencies for %post and %postun scriptlets (#156901).
+* Tue Jul 26 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.7-1jpp
+- Upgrade to 1.7
-* Wed May 4 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_2fc
-- BC-compile the main jarfile.
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_1fc
-- Build into Fedora.
-
-* Fri Nov 26 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6-2jpp_1rh
-- Merge with upstream for fix
-
-* Fri Nov 26 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6-2jpp
+* Thu Nov 26 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6-2jpp
- Rebuild so that rss package is included
* Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6-1jpp
- Upgrade to 1.6
-* Fri Oct 1 2004 Andrew Overholt <overholt at redhat.com> 0:1.5-3jpp_5rh
-- add coreutils BuildRequires
-
* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.5-4jpp
- Rebuild with ant-1.6.2
-* Fri Jul 2 2004 Aizaz Ahmed <aahmed at redhat.com> 0:1.5-3jpp_4rh
-- Added trigger to restore symlinks that are removed if ugrading
- from a commons-digester rhug package
-
-* Fri Apr 2 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.5-3jpp_3rh
-- more of the same, for version-suffixed .jar files
-
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.5-3jpp_2rh
-- add RHUG upgrade cleanup
-
* Fri May 09 2003 David Walluck <david at anti-microsoft.org> 0:1.5-3jpp
- update for JPackage 1.5
More information about the fedora-cvs-commits
mailing list