Author: glen Date: Wed Apr 27 06:42:46 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- disable java on ac where java-sun not present
---- Files affected:
packages/tzdata:
tzdata.spec (1.102 -> 1.103)
---- Diffs:
================================================================
Index: packages/tzdata/tzdata.spec
diff -u packages/tzdata/tzdata.spec:1.102 packages/tzdata/tzdata.spec:1.103
--- packages/tzdata/tzdata.spec:1.102 Tue Apr 26 14:38:13 2011
+++ packages/tzdata/tzdata.spec Wed Apr 27 08:42:40 2011
@@ -4,13 +4,19 @@
%bcond_without tests # make check
%bcond_without java # build java subpackage
+%if "%{pld_release}" == "ac"
+%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
+%undefine with_java
+%endif
+%endif
+
%define tzcode_ver 2011g
%define tzdata_ver 2011g
Summary: Timezone data
Summary(pl.UTF-8): Dane o strefach czasowych
Name: tzdata
Version: %{tzdata_ver}
-Release: 1
+Release: 2
License: Public Domain (database), BSD/LGPL v2.1+ (code/test suite)
Group: Base
# The tzdata-base-0.tar.bz2 is a simple building infrastructure and
@@ -30,6 +36,7 @@
Source6: timezone.upstart
Patch1: javazic-fixup.patch
URL: http://www.twinsun.com/tz/tz-link.htm
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.300
%if %{with java}
BuildRequires: jpackage-utils
@@ -251,6 +258,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.103 2011/04/27 06:42:40 glen
+- disable java on ac where java-sun not present
+
Revision 1.102 2011/04/26 12:38:13 marti
- tzdata and tzcode up to 2011g
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tzdata/tzdata.spec?r1=1.102&r2=1.103&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
