X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdkxft.spec;h=d0253b64ffeea0a13331ba1eb25e57fe1a8436c2;hb=7a28e8db35efe1ef3289cdeee9d361a151d550b6;hp=d2e8669c8c5e4592d36736123f722ae42ae25ba5;hpb=8390599359550b35d83dcde5fc03c820b51b464a;p=packages%2Fgdkxft.git

diff --git a/gdkxft.spec b/gdkxft.spec
index d2e8669..d0253b6 100644
--- 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
@@ -11,22 +11,22 @@ Version:	1.5
 Release:	12
 License:	LGPL
 Group:		X11/Libraries
-Source0:	ftp://ftp.sourceforge.net/pub/sourceforge/gdkxft/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/gdkxft/%{name}-%{version}.tar.gz
+# Source0-md5:	ed594e24cf2aefe7a71f96425c1922e8
 URL:		http://gdkxft.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{!?_without_gnome:BuildRequires:	control-center-devel}
-%{!?_without_gnome:BuildRequires:	libglade-gnome-devel}
+%{?with_gnome:BuildRequires:	control-center1-devel}
+BuildRequires:	freetype-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)
 
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
-
-%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
 the fonts.
@@ -91,7 +91,7 @@ Narz
 %setup -q
 
 %build
-%if %{?_without_gnome:1}%{!?_without_gnome:0}
+%if %{without gnome}
 cat >> acinclude.m4 <<EOF
 AC_DEFUN([AM_PATH_LIBGLADE],[
 AM_CONDITIONAL([HAVE_ORBIT],false)
@@ -104,6 +104,7 @@ rm -f missing
 %{__autoconf}
 %{__automake}
 %configure \
+	CFLAGS="%{rpmcflags} -I%{_includedir}/freetype2" \
 	--enable-static \
 	--enable-shared
 
@@ -119,14 +120,17 @@ install -d $RPM_BUILD_ROOT{/etc/X11/xinit/xinitrc.d,%{_datadir}/themes/Gdkxft/gt
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-perl -pi -e "s@\\\`gtk-config --prefix\\\` \\|\\| \"/usr\"@\"`gtk-config --prefix`\"@g" \
+%{__perl} -pi -e "s@\\\`gtk-config --prefix\\\` \\|\\| \"/usr\"@\"`gtk-config --prefix`\"@g" \
 	$RPM_BUILD_ROOT%{_sbindir}/gdkxft_sysinstall
 
 > $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/gdkxft
 > $RPM_BUILD_ROOT%{_datadir}/themes/Gdkxft/gtk/gtkrc
 
+%if %{with gnome}
 install -d $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME
-mv -f $RPM_BUILD_ROOT{%{_datadir}/gnome/apps/Settings/UIOptions,%{_applnkdir}/Settings/GNOME}
+mv -f	$RPM_BUILD_ROOT%{_datadir}/gnome/apps/Settings/UIOptions \
+	$RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -155,19 +159,19 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgdkxft.la
+%{_libdir}/libgdkxft.la
 %attr(755,root,root) %{_libdir}/libgdkxft.so
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgdkxft.a
 
-%if %{?_without_gnome:0}%{!?_without_gnome:1}
+%if %{with gnome}
 %files capplet
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*-capplet
 %{_datadir}/gdkxft-capplet.glade
-%{_datadir}/pixmaps/gdkxft.png
 %{_datadir}/control-center/UIOptions/gdkxft.desktop
+%{_pixmapsdir}/gdkxft.png
 %{_applnkdir}/Settings/GNOME/UIOptions/gdkxft.desktop
 %endif