- merged from DEVEL

Changed files:
    pango.spec -> 1.100

diff --git a/pango.spec b/pango.spec
index 50cfdaaac89ba9902f56b94d3e2637313801bbe8..d1acc7b769e4d27be90261aeb42796a8b3cf31bd 100644 (file)
--- a/pango.spec
+++ b/pango.spec
@@ -1,29 +1,32 @@
+%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
 Name:          pango
-Version:       1.2.5
-Release:       2
+Version:       1.4.0
+Release:       1
 License:       LGPL
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
-# Source0-md5: df00fe3e71cd297010f24f439b6c8ee6
+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
-Patch1:                %{name}-freetype-includes.patch
 URL:           http://www.pango.org/
 BuildRequires: XFree86-devel
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf >= 2.54
 BuildRequires: automake
-BuildRequires: freetype-devel >= 2.1.3
-BuildRequires: glib2-devel >= 2.2.3
-BuildRequires: gtk-doc >= 0.9-4
+BuildRequires: docbook-dtd412-xml
+BuildRequires: docbook-style-xsl
+BuildRequires: freetype-devel >= 2.1.7
+BuildRequires: glib2-devel >= 2.4.0
+BuildRequires: gtk-doc >= 1.0
 BuildRequires: libtool
 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.3
+Requires:      freetype >= 2.1.7
 Obsoletes:     libpango24
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -42,10 +45,10 @@ Summary:    System for layout and rendering of internationalized text
 Summary(pl):   System obs³ugi i renderowania miêdzynarodowego tekstu
 Summary(pt_BR):        Sistema para layout e renderização de texto internacionalizado
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 Requires:      XFree86-devel
-Requires:      freetype-devel >= 2.1.3
-Requires:      glib2-devel >= 2.2.3
+Requires:      freetype-devel >= 2.1.7
+Requires:      glib2-devel >= 2.4.0
 Requires:      gtk-doc-common
 Requires:      xft-devel >= 2.1.2
 Obsoletes:     libpango24-devel
@@ -65,7 +68,7 @@ Summary:      Static %{name} libraries
 Summary(pl):   Biblioteki statyczne %{name}
 Summary(pt_BR):        Sistema para layout e renderização de texto internacionalizado
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Static %{name} libraries.
@@ -82,8 +85,8 @@ Summary:      System for layout and rendering of internationalized text
 Summary(pl):   System obs³ugi i renderowania miêdzynarodowego tekstu
 Summary(pt_BR):        Sistema para layout e renderização de texto internacionalizado
 Group:         X11/Development/Libraries
-Requires(post,postun): %{name} = %{version}
-Requires:      %{name} = %{version}
+Requires(post,postun): %{name} = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 
 %description modules
 System for layout and rendering of internationalized text.
@@ -104,18 +107,21 @@ internacionalizado.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
+gtkdocize --copy
 %{__libtoolize}
 %{__aclocal}
+%{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
+       --with-fribidi \
+       --enable-gtk-doc \
+       --with-html-dir=%{_gtkdocdir} \
        --enable-static \
        --enable-debug=%{?debug:yes}%{!?debug:minimum} \
-       --enable-gtk-doc \
-       --with-html-dir=%{_gtkdocdir}
+       --enable-man
 %{__make}
 
 %install
@@ -125,12 +131,11 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        pkgconfigdir=%{_pkgconfigdir} \
        HTML_DIR=%{_gtkdocdir}
-
 %{__perl} -pi -e 's|-I/usr/include | |g' $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
 > $RPM_BUILD_ROOT%{_sysconfdir}/pango/pango.modules
 
 # useless (modules loaded through libgmodule)
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.2.0/modules/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.4.0/modules/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -139,16 +144,19 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 umask 022
 %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules
+exit 0
 
 %postun -p /sbin/ldconfig
 
 %post modules
 umask 022
 %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules
+exit 0
 
 %postun modules
 umask 022
 %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules
+exit 0
 
 %files
 %defattr(644,root,root,755)
@@ -156,12 +164,13 @@ umask 022
 %attr(755,root,root) %{_bindir}/pango-querymodules
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %dir %{_libdir}/pango
-%dir %{_libdir}/pango/1.2.0
-%dir %{_libdir}/pango/1.2.0/modules
-%attr(755,root,root) %{_libdir}/pango/1.2.0/modules/*basic*.so
+%dir %{_libdir}/pango/1.4.0
+%dir %{_libdir}/pango/1.4.0/modules
+%attr(755,root,root) %{_libdir}/pango/1.4.0/modules/*basic*.so
 %dir %{_sysconfdir}/pango
 %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/pango/pangox.aliases
 %ghost %{_sysconfdir}/pango/pango.modules
+%{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -178,5 +187,5 @@ umask 022
 
 %files modules
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/pango/1.2.0/modules/*.so
-%exclude %{_libdir}/pango/1.2.0/modules/*basic*.so
+%attr(755,root,root) %{_libdir}/pango/1.4.0/modules/*.so
+%exclude %{_libdir}/pango/1.4.0/modules/*basic*.so