rpms/libfontenc/devel libfontenc.spec,1.4,1.5

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/libfontenc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2320

Modified Files:
	libfontenc.spec 
Log Message:
* Tue Nov 22 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
- Added libfontenc-0.99.2-use-datadir-for-encodings.patch and invoke aclocal
  and automake to activate the changes.  This fixes a bug reported against
  mkfontscale, in which it looks in _datadir for the font encodings files,
  which was traced back to libfontenc (#173875).
- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-2" to ensure that
  /usr/include/X11 is a directory rather than a symlink before this package
  gets installed, to avoid bug (#173384).



Index: libfontenc.spec
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libfontenc.spec	11 Nov 2005 21:38:59 -0000	1.4
+++ libfontenc.spec	23 Nov 2005 00:29:59 -0000	1.5
@@ -1,13 +1,15 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
 Version: 0.99.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/release/X11R7.0-RC2/everything/%{name}-%{version}.tar.bz2
+Patch0: libfontenc-0.99.2-use-datadir-for-encodings.patch
+
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
 
@@ -20,7 +22,7 @@
 Summary: X.Org X11 libfontenc development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-
+Requires(pre): xorg-x11-filesystem >= 0.99.2-2
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -29,12 +31,18 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .use-datadir-for-encodings
 
 # Disable static library creation by default.
 %define with_static 0
 
 %build
-
+# FIXME: libfontenc-0.99.2-use-datadir-for-encodings.patch requires that
+# aclocal, automake, and autoconf get invoked to activate the changes.
+# These can be removed once the patch is no longer necessary.
+aclocal
+automake
+autoconf
 %configure \
 %if ! %{with_static}
 	--disable-static
@@ -42,12 +50,11 @@
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
-# We intentionally don't ship *.la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# Remove all libtool archives (*.la)
+find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,12 +82,20 @@
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Tue Nov 22 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2
+- Added libfontenc-0.99.2-use-datadir-for-encodings.patch and invoke aclocal
+  and automake to activate the changes.  This fixes a bug reported against
+  mkfontscale, in which it looks in _datadir for the font encodings files,
+  which was traced back to libfontenc (#173875).
+- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-2" to ensure that
+  /usr/include/X11 is a directory rather than a symlink before this package
+  gets installed, to avoid bug (#173384).
+
 * Fri Nov 11 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-1
 - Updated libfontenc to version 0.99.2 from X11R7 RC2
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-
 * Mon Oct 24 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-1
 - Updated libfontenc to version 0.99.1 from X11R7 RC1