- bconds, changelog cleanups

[packages/gdkxft.git] / gdkxft.spec

diff --git a/gdkxft.spec b/gdkxft.spec
index 4527022488c4edd1b2911fb7d4a39967db6d0c88..9b86af8f38614b9a1c5c1731de18e134dd06f8d0 100644 (file)
--- a/gdkxft.spec
+++ b/gdkxft.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-# _without_gnome       - without capplet subpackage (which require GNOME libs to build)
+%bcond_without gnome           # without capplet subpackage (which require GNOME libs to build)
 #
 %include       /usr/lib/rpm/macros.perl
 Summary:       Adapt GTK-1.2 to support xft fonts
@@ -16,11 +16,11 @@ Source0:    http://dl.sourceforge.net/gdkxft/%{name}-%{version}.tar.gz
 URL:           http://gdkxft.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
-%{!?_without_gnome:BuildRequires:      control-center-devel}
+%{?with_gnome:BuildRequires:   control-center-devel}
 BuildRequires: freetype-devel
 BuildRequires: gtk+-devel >= 1.2.0
 BuildRequires: help2man
-%{!?_without_gnome:BuildRequires:      libglade-gnome-devel}
+%{?with_gnome:BuildRequires:   libglade-gnome-devel}
 BuildRequires: libtool
 BuildRequires: rpm-perlprov
 Requires(post):        /sbin/ldconfig
@@ -91,7 +91,7 @@ Narz
 %setup -q
 
 %build
-%if %{!?_without_gnome:1}0
+%if %{with gnome}
 cat >> acinclude.m4 <<EOF
 AC_DEFUN([AM_PATH_LIBGLADE],[
 AM_CONDITIONAL([HAVE_ORBIT],false)
@@ -126,7 +126,7 @@ install -d $RPM_BUILD_ROOT{/etc/X11/xinit/xinitrc.d,%{_datadir}/themes/Gdkxft/gt
 > $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/gdkxft
 > $RPM_BUILD_ROOT%{_datadir}/themes/Gdkxft/gtk/gtkrc
 
-%if %{!?_without_gnome:1}0
+%if %{with gnome}
 install -d $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME
 mv -f  $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Settings/UIOptions \
        $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME
@@ -166,7 +166,7 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libgdkxft.a
 
-%if %{!?_without_gnome:1}0
+%if %{with gnome}
 %files capplet
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*-capplet