Author: glen Date: Sat Oct 8 10:29:13 2011 GMT
Module: packages Tag: SUBVERSION_1_6
---- Log message:
- disable csvn,gnome,javahl,kde,ruby bconds for ac
---- Files affected:
packages/subversion:
subversion.spec (1.314.2.1 -> 1.314.2.2)
---- Diffs:
================================================================
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.314.2.1
packages/subversion/subversion.spec:1.314.2.2
--- packages/subversion/subversion.spec:1.314.2.1 Fri Oct 7 22:12:29 2011
+++ packages/subversion/subversion.spec Sat Oct 8 12:29:08 2011
@@ -7,17 +7,26 @@
%bcond_without neon # use serf instead of neon
%bcond_without swig # disable bindings generation with Swig
%bcond_without python # build without Python bindings (broken)
-%bcond_without csvn # build Python csvn bindings
%bcond_without perl # build without Perl bindings
-%bcond_without ruby # build without Ruby bindings
%bcond_without apache # build without Apache support (webdav,
etc)
-%bcond_without javahl # build without javahl support (Java
high-level bindings)
%bcond_without tests # don't perform "make check"
%bcond_without kwallet # build without kde4 wallet support
-%bcond_without kde # build without kde4 support
(alias for kwallet)
-%bcond_without gnome # build without gnome keyring support
%bcond_without db # disable Subversion Berkeley
DB based filesystem library
+%if "%{pld_release}" == "ac"
+%bcond_with csvn # build Python csvn bindings
+%bcond_with gnome # build without gnome keyring support
+%bcond_with javahl # build without javahl support (Java
high-level bindings)
+%bcond_with kde # build without kde4 support
(alias for kwallet)
+%bcond_with ruby # build without Ruby bindings
+%else
+%bcond_without csvn # build Python csvn bindings
+%bcond_without gnome # build without gnome keyring support
+%bcond_without javahl # build without javahl support (Java
high-level bindings)
+%bcond_without kde # build without kde4 support
(alias for kwallet)
+%bcond_without ruby # build without Ruby bindings
+%endif
+
%if %{with net_client_only}
%undefine with_apache
%undefine with_db
@@ -77,6 +86,7 @@
BuildRequires: automake
BuildRequires: db-devel >= 4.1.25
BuildRequires: libtool
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.583
%if %{with perl}
BuildRequires: perl-devel >= 1:5.8.0
@@ -915,6 +925,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.314.2.2 2011/10/08 10:29:08 glen
+- disable csvn,gnome,javahl,kde,ruby bconds for ac
+
Revision 1.314.2.1 2011/10/07 20:12:29 glen
- temp fix for check_so
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion.spec?r1=1.314.2.1&r2=1.314.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
