- cleanups, fixed glib2 deps, updated ac/am deps

Changed files:
    pango.spec -> 1.101

diff --git a/pango.spec b/pango.spec
index d1acc7b769e4d27be90261aeb42796a8b3cf31bd..403d2027ac11d208498ed4f4d37bc26a36c6d6b3 100644 (file)
--- a/pango.spec
+++ b/pango.spec
@@ -1,4 +1,3 @@
-%define        snap    20040114
 Summary:       System for layout and rendering of internationalized text
 Summary(pl):   System renderowania miêdzynarodowego tekstu
 Summary(pt_BR):        Sistema para layout e renderização de texto internacionalizado
@@ -9,24 +8,24 @@ License:      LGPL
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/1.4/%{name}-%{version}.tar.bz2
 # Source0-md5: 9b5d9a5dcce5b3899d401f9c2cd6873f
-#Source0:      %{name}-%{version}-%{snap}.tar.bz2
 Patch0:                %{name}-xfonts.patch
 URL:           http://www.pango.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf >= 2.54
-BuildRequires: automake
+BuildRequires: automake >= 1.7
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-style-xsl
 BuildRequires: freetype-devel >= 2.1.7
-BuildRequires: glib2-devel >= 2.4.0
+BuildRequires: glib2-devel >= 1:2.4.0
 BuildRequires: gtk-doc >= 1.0
-BuildRequires: libtool
+BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.1-8.2
 BuildRequires: xft-devel >= 2.1.2
 Requires(post):        /sbin/ldconfig
 Requires:      freetype >= 2.1.7
+Requires:      glib2 >= 1:2.4.0
 Obsoletes:     libpango24
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,7 +47,7 @@ Group:                X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      XFree86-devel
 Requires:      freetype-devel >= 2.1.7
-Requires:      glib2-devel >= 2.4.0
+Requires:      glib2-devel >= 1:2.4.0
 Requires:      gtk-doc-common
 Requires:      xft-devel >= 2.1.2
 Obsoletes:     libpango24-devel
@@ -129,9 +128,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       pkgconfigdir=%{_pkgconfigdir} \
-       HTML_DIR=%{_gtkdocdir}
-%{__perl} -pi -e 's|-I/usr/include | |g' $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
+       pkgconfigdir=%{_pkgconfigdir}
+
 > $RPM_BUILD_ROOT%{_sysconfdir}/pango/pango.modules
 
 # useless (modules loaded through libgmodule)