Author: glen Date: Wed Apr 7 08:26:06 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- BRs by bconds, move common BR first, it is too messy otherwise
---- Files affected:
packages/ice:
ice.spec (1.22 -> 1.23)
---- Diffs:
================================================================
Index: packages/ice/ice.spec
diff -u packages/ice/ice.spec:1.22 packages/ice/ice.spec:1.23
--- packages/ice/ice.spec:1.22 Tue Apr 6 22:51:16 2010
+++ packages/ice/ice.spec Wed Apr 7 10:26:01 2010
@@ -3,12 +3,12 @@
# - finish (pldize) -servers package
#
# Conditional build:
-%bcond_without java # Java bindings
+%bcond_without gui # IceGrid GUI
%bcond_without dotnet # .NET bindings
+%bcond_without java # Java bindings
+%bcond_without php # PHP bindings
%bcond_without python # Python bindings
%bcond_without ruby # Ruby bindings
-%bcond_without php # PHP bindings
-%bcond_without gui # IceGrid GUI
%if "%{pld_release}" == "ti"
%bcond_without java_sun # build with gcj
@@ -42,11 +42,20 @@
Patch1: dont-build-demo-test.patch
Patch2: java-build.patch
Patch3: jgoodies.patch
-%{?with_gui:BuildRequires: ImageMagick}
-%{?with_gui:BuildRequires: ImageMagick-coder-png}
BuildRequires: bzip2-devel
BuildRequires: db-cxx-devel
BuildRequires: expat-devel
+BuildRequires: mcpp-devel
+BuildRequires: openssl-devel
+BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpmbuild(macros) >= 1.533
+%if %{with gui}
+BuildRequires: ImageMagick
+BuildRequires: ImageMagick-coder-png
+%endif
+%if %{with dotnet}
+BuildRequires: mono-csharp
+%endif
%if %{with java}
BuildRequires: ant-nodeps
BuildRequires: db-java-devel
@@ -55,18 +64,19 @@
BuildRequires: java-jgoodies-looks
%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: jpackage-utils
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
%endif
-BuildRequires: mcpp-devel
-BuildRequires: mono-csharp
-BuildRequires: openssl-devel
-%{?with_php:BuildRequires: php-devel >= 3:5.0.0}
+%if %{with php}
+BuildRequires: php-devel >= 3:5.0.0
+%endif
+%if %{with python}
BuildRequires: python-devel
-%{?with_python:BuildRequires: rpm-pythonprov}
-BuildRequires: rpmbuild(macros) >= 1.533
-%{?with_ruby:BuildRequires: ruby >= 1:1.8.6}
+BuildRequires: rpm-pythonprov
+%endif
+%if %{with ruby}
+BuildRequires: ruby >= 1:1.8.6
BuildRequires: ruby-devel
+%endif
# Ice doesn't officially support ppc64 at all; sparc64 doesnt have mono
ExcludeArch: ppc64 sparc64
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -636,6 +646,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2010/04/07 08:26:01 glen
+- BRs by bconds, move common BR first, it is too messy otherwise
+
Revision 1.22 2010/04/06 20:51:16 sparky
- BR: bzip2-devel, expat-devel, mono-csharp, openssl-devel, python-devel,
ruby-devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.22&r2=1.23&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
