rpms/jakarta-commons-validator/devel jakarta-commons-validator.spec, 1.12, 1.13
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jul 25 18:52:09 UTC 2006
Author: dbhole
Update of /cvs/dist/rpms/jakarta-commons-validator/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17499
Modified Files:
jakarta-commons-validator.spec
Log Message:
- Added conditional native compilation.
- Converted spec file to UTF8.
Index: jakarta-commons-validator.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jakarta-commons-validator.spec 22 Jul 2006 08:43:11 -0000 1.12
+++ jakarta-commons-validator.spec 25 Jul 2006 18:52:07 -0000 1.13
@@ -1,19 +1,55 @@
+# 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 with_tests %{?_with_tests:1}%{!?_without_tests:0}
+
%define base_name validator
%define short_name commons-%{base_name}
-%define name jakarta-%{short_name}
%define section free
-%define with_tests %{?_with_tests:1}%{!?_without_tests:0}
Summary: Jakarta Commons Validator
-Name: %{name}
+Name: jakarta-%{short_name}
Version: 1.1.4
-Release: 1jpp_7fc
+Release: 3jpp_1fc
Epoch: 0
License: Apache Software License
Group: Development/Libraries/Java
Source0: http://www.apache.org/dist/jakarta/commons/validator/source/commons-validator-%{version}-src.tar.gz
Source1: %{name}.catalog
# FIXME DTDs are not in the source tarball anymore (conf directory missing)
+# Obtainable from:
+# http://svn.apache.org/repos/asf/jakarta/commons/proper/validator/tags/VALIDATOR_1_1_4/conf/
Source2: commons-validator-%{version}-conf.tar.gz
Patch1: jakarta-commons-validator-%{version}-build.patch
URL: http://jakarta.apache.org/commons/validator/
@@ -32,10 +68,18 @@
Requires: jakarta-commons-logging >= 0:1.0.2
Requires: oro >= 0:2.0.6
Requires: xml-commons-apis
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+%if ! %{gcj_support}
+BuildArch: noarch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+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
A common issue when receiving data either electronically or from user
@@ -57,11 +101,11 @@
%prep
%setup -q -n %{short_name}-%{version}
+
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
tar xzvf %{SOURCE2}
-
cp -p %{SOURCE1} conf/share/catalog
%patch1
@@ -98,10 +142,12 @@
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
@@ -115,7 +161,19 @@
%{_datadir}/sgml/%{name}/catalog > /dev/null || :
fi
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
%postun
# Note that we're using versioned catalog, so this is always ok.
@@ -125,16 +183,24 @@
%{_datadir}/sgml/%{name}/catalog > /dev/null || :
fi
-%{_bindir}/rebuild-gcj-db
-
# -----------------------------------------------------------------------------
+%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 NOTICE.txt
%{_javadir}/*
%{_datadir}/sgml/%{name}
+
+%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
%files javadoc
%defattr(0644,root,root,0755)
@@ -143,29 +209,15 @@
# -----------------------------------------------------------------------------
%changelog
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1.4-1jpp_7fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1.4-1jpp_6fc
-- rebuild
-
-* Tue Feb 21 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.1.4-1jpp_5fc
-- Updated to 1.1.4 and aot compiled.
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.1.3-1jpp_4fc
-- rebuilt again
+* Tue Jul 25 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1.4-3jpp_1fc
+- Added conditional native compilation.
+- Converted spec file to UTF8.
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.1.3-1jpp_3fc
-- rebuilt
+* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.1.4-2jpp
+- First JPP 1.7 build
-* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> - 0:1.1.3-1jpp_2fc
-- Remove jarfile from the tarball.
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.1.3-1jpp_1fc
-- Build into Fedora.
-
-* Fri Nov 26 2004 Fernando Nasser <fnasser at redhat.com> 0:1.1.3-1jpp_1rh
-- Merge with upstream for upgrade
+* Tue Jul 26 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.1.4-1jpp
+- Upgrade to 1.1.4
* Tue Sep 07 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.1.3-1jpp
- Upgrade to 1.1.3
@@ -173,22 +225,19 @@
* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.0.2-3jpp
- Rebuild with ant-1.6.2
-* Thu Mar 4 2004 Frank Ch. Eigler <fche at redhat.com> 0:4.1.29-2jpp_1rh
-- RH vacuuming
-
-* Fri Apr 18 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.2-2jpp
+* Fri Apr 18 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.2-2jpp
- Move DTDs from %%{_datadir}/%{name} to %%{_datadir}/sgml/%%{name} for FHS
compliance, <http://www.pathname.com/fhs/2.2/fhs-4.11.html#4.11.7>.
-* Fri Apr 18 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.2-1jpp
+* Fri Apr 18 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.2-1jpp
- Update to 1.0.2 and JPackage 1.5.
- Move DTDs from %%doc to %%{_datadir}/%%{name}.
- Include catalog for DTDs, and install it if %%{_bindir}/install-catalog
is available.
-* Mon Dec 16 2002 Ville Skyttä <ville.skytta at iki.fi> - 1.0.1-1jpp
+* Mon Dec 16 2002 Ville Skyttä <ville.skytta at iki.fi> - 1.0.1-1jpp
- 1.0.1.
- Include the DTD in the package (as documentation).
-* Sat Nov 2 2002 Ville Skyttä <ville.skytta at iki.fi> - 1.0-1jpp
+* Sat Nov 2 2002 Ville Skyttä <ville.skytta at iki.fi> - 1.0-1jpp
- 1.0, initial JPackage release.
More information about the fedora-cvs-commits
mailing list