- +bcond_without selinux

Changed files:
    gdm.spec -> 1.156
    gdm2.20.spec -> 1.156

diff --git a/gdm.spec b/gdm.spec
index a88b857f04f65a0c930bbe04601ad737b96493c0..f7ad9388fb025af36e3cd48cd6e5eafc108771d3 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -3,6 +3,9 @@
 # s=/dev/null=/home/services/xdm= in %%trigger for gracefull upgrade from xdm/kdm/gdm 2.2
 # check /etc/pam.d/gdm-autologin
 #
+# Conditiional build:
+%bcond_without selinux # without selinux
+#
 Summary:       GNOME Display Manager
 Summary(es):   Administrador de Entrada del GNOME
 Summary(ja):   GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
@@ -44,7 +47,7 @@ BuildRequires:        libgnomecanvas-devel >= 2.6.1
 BuildRequires: libgnomeui-devel >= 2.6.1
 BuildRequires: libgsf-devel >= 1.9.0
 BuildRequires: librsvg-devel >= 1:2.6.5
-BuildRequires: libselinux-devel
+%{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.5.11
 BuildRequires: pam-devel
@@ -160,7 +163,7 @@ intltoolize --copy --force
        --with-tcp-wrappers=yes \
        --enable-authentication-scheme=pam \
        --disable-console-helper \
-       --with-selinux
+       --with%{!?with_selinux:out}-selinux
 
 %{__make}
 

diff --git a/gdm2.20.spec b/gdm2.20.spec
index a88b857f04f65a0c930bbe04601ad737b96493c0..f7ad9388fb025af36e3cd48cd6e5eafc108771d3 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -3,6 +3,9 @@
 # s=/dev/null=/home/services/xdm= in %%trigger for gracefull upgrade from xdm/kdm/gdm 2.2
 # check /etc/pam.d/gdm-autologin
 #
+# Conditiional build:
+%bcond_without selinux # without selinux
+#
 Summary:       GNOME Display Manager
 Summary(es):   Administrador de Entrada del GNOME
 Summary(ja):   GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
@@ -44,7 +47,7 @@ BuildRequires:        libgnomecanvas-devel >= 2.6.1
 BuildRequires: libgnomeui-devel >= 2.6.1
 BuildRequires: libgsf-devel >= 1.9.0
 BuildRequires: librsvg-devel >= 1:2.6.5
-BuildRequires: libselinux-devel
+%{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.5.11
 BuildRequires: pam-devel
@@ -160,7 +163,7 @@ intltoolize --copy --force
        --with-tcp-wrappers=yes \
        --enable-authentication-scheme=pam \
        --disable-console-helper \
-       --with-selinux
+       --with%{!?with_selinux:out}-selinux
 
 %{__make}