- strict internal deps

[packages/gdkxft.git] / gdkxft.spec

diff --git a/gdkxft.spec b/gdkxft.spec
index c5552d46de2cb65b333828f3f494e68bdf626d36..e91586aec55ef0560864d8b37416d77cdeb68d20 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,30 +16,30 @@ Source0:    http://dl.sourceforge.net/gdkxft/%{name}-%{version}.tar.gz
 URL:           http://gdkxft.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
+%{?with_gnome:BuildRequires:   control-center1-devel}
 BuildRequires: freetype-devel
-BuildRequires: help2man
-%{!?_without_gnome:BuildRequires:      control-center-devel}
-%{!?_without_gnome:BuildRequires:      libglade-gnome-devel}
 BuildRequires: gtk+-devel >= 1.2.0
+BuildRequires: help2man
+%{?with_gnome:BuildRequires:   libglade-gnome-devel}
 BuildRequires: libtool
 BuildRequires: rpm-perlprov
 Requires(post):        /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description 
+%description
 A library that adds transparent support for anti-aliased fonts to the
-libgdk component of gtk+-1.2.x. Gtk+ widgets will automagically use
+libgdk component of gtk+-1.2.x. GTK+ widgets will automagically use
 the fonts.
 
 %description -l pl
-Biblioteka dodaj±ca prze¼roczyst± obs³ugê dla wyg³adzanych fontów w
-komponencie libgdk biblioteki gtk+-1.2.x. Widgety gtk+ automatycznie
+Biblioteka dodaj±ca przezroczyst± obs³ugê dla wyg³adzanych fontów w
+komponencie libgdk biblioteki gtk+-1.2.x. Widgety GTK+ automatycznie
 bêd± u¿ywa³y tych fontów.
 
 %description -l pt_BR
 Este pacote contém bibliotecas para adicionar suporte transparente a
 fontes anti-aliased para o componente libgdk do gtk+-1.2. Os widgets
-Gtk+ vão automaticamente usar essas fontes.
+GTK+ vão automaticamente usar essas fontes.
 
 %package devel
 Summary:       Header files for developing apps
@@ -47,7 +47,7 @@ Summary(es):  Bibliotecas y archivos de inclusi
 Summary(pl):   Pliki nag³owkowe gdkxft
 Summary(pt_BR):        Bibliotecas e arquivos de inclusão para desenvolvimento
 Group:         Development/Libraries
-PreReq:                %{name} = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 Header files for developing apps with will use libgdkxft.
@@ -79,7 +79,7 @@ Bibliotecas est
 Summary:       Capplet to configure gdkxft in GNOME
 Summary(pl):   Narzêdzie do konfiguracji gdkxft w GNOME
 Group:         X11/Applications
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description capplet
 Capplet to configure gdkxft in GNOME.
@@ -91,7 +91,7 @@ Narz
 %setup -q
 
 %build
-%if %{!?_without_gnome:1}0
+%if %{without gnome}
 cat >> acinclude.m4 <<EOF
 AC_DEFUN([AM_PATH_LIBGLADE],[
 AM_CONDITIONAL([HAVE_ORBIT],false)
@@ -104,7 +104,7 @@ rm -f missing
 %{__autoconf}
 %{__automake}
 %configure \
-       CFLAGS="%{rpmcflags} -I%{_includedir}/freetype2" \
+       CFLAGS="%{rpmcflags} -I/usr/include/freetype2" \
        --enable-static \
        --enable-shared
 
@@ -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
@@ -153,7 +153,7 @@ fi
 %dir %{_datadir}/themes/Gdkxft/gtk
 %ghost %{_datadir}/themes/Gdkxft/gtk/gtkrc
 %attr(755,root,root) %ghost /etc/X11/xinit/xinitrc.d/gdkxft
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/gdkxft.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdkxft.conf
 %attr(755,root,root) %{_sbindir}/gdkxft_sysinstall
 %attr(755,root,root) %{_libdir}/libgdkxft.so.*.*
 
@@ -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