rpms/xorg-x11-font-utils/devel font-util-1.0.1-autoconf-add-with-fontdir-option.patch, NONE, 1.1 font-util-1.0.1-mapdir-use-datadir-fix.patch, NONE, 1.1 sources, 1.9, 1.10 xorg-x11-font-utils.spec, 1.18, 1.19 font-util-1.0.0-autoconf-add-with-fontdir-option.patch, 1.1, NONE font-util-1.0.0-mapdir-use-datadir-fix.patch, 1.1, NONE

Thu Jun 22 03:16:43 UTC 2006

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12929

Modified Files:
	sources xorg-x11-font-utils.spec 
Added Files:
	font-util-1.0.1-autoconf-add-with-fontdir-option.patch 
	font-util-1.0.1-mapdir-use-datadir-fix.patch 
Removed Files:
	font-util-1.0.0-autoconf-add-with-fontdir-option.patch 
	font-util-1.0.0-mapdir-use-datadir-fix.patch 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:7.1-1
- Update to font-util-1.0.1 from X11R7.1
- Set package version to X11 release the tarballs are based from.


font-util-1.0.1-autoconf-add-with-fontdir-option.patch:
 configure.ac   |    7 +++++++
 fontutil.pc.in |    1 +
 2 files changed, 8 insertions(+)

--- NEW FILE font-util-1.0.1-autoconf-add-with-fontdir-option.patch ---
--- font-util-1.0.1/configure.ac.autoconf-add-with-fontdir-option	2005-12-16 00:16:32.000000000 -0500
+++ font-util-1.0.1/configure.ac	2005-12-16 00:13:07.000000000 -0500
@@ -40,6 +40,13 @@
 	[MAPDIR="$DEFAULT_MAPDIR"])
 AC_SUBST(MAPDIR)
 
+DEFAULT_FONTDIR=${datadir}/X11/fonts
+AC_ARG_WITH(fontdir,
+	AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install Xorg fonts by default]),
+	[FONTDIR="$withval"],
+	[FONTDIR="$DEFAULT_FONTDIR"])
+AC_SUBST(FONTDIR)
+
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
--- font-util-1.0.1/fontutil.pc.in.autoconf-add-with-fontdir-option	2005-12-16 00:17:06.000000000 -0500
+++ font-util-1.0.1/fontutil.pc.in	2005-12-16 00:10:40.000000000 -0500
@@ -2,6 +2,7 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 mapdir=@MAPDIR@
+fontdir=@FONTDIR@
  
 Name: FontUtil
 Description: Font utilities dirs

font-util-1.0.1-mapdir-use-datadir-fix.patch:
 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE font-util-1.0.1-mapdir-use-datadir-fix.patch ---
--- font-util-1.0.0/configure.ac.font-util-mapdir-use-datadir-fix	2005-12-14 19:24:26.000000000 -0500
+++ font-util-1.0.1/configure.ac	2005-12-16 00:07:23.000000000 -0500
@@ -33,7 +33,7 @@
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
 
-DEFAULT_MAPDIR=${libdir}/X11/fonts/util
+DEFAULT_MAPDIR=${datadir}/X11/fonts/util
 AC_ARG_WITH(mapdir,
 	AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps]),
 	[MAPDIR="$withval"],


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Apr 2006 22:32:19 -0000	1.9
+++ sources	22 Jun 2006 03:16:41 -0000	1.10
@@ -1,5 +1,5 @@
 f489db67914ca4d9d2fa0331132f342b  bdftopcf-1.0.0.tar.bz2
-0a537f95ee9d46f9e5b58c1a2c733dd4  font-util-1.0.0.tar.bz2
+b81535f78fe05732931f02841e5ca37b  font-util-1.0.1.tar.bz2
 efe452ec264ee0fddbe9300873164dec  fonttosfnt-1.0.1.tar.bz2
 94da9dcd2447300e8fdada896d7ed433  mkfontdir-1.0.2.tar.bz2
 1e74e68eb9e8e91c6b7b615d80dc5ee1  mkfontscale-1.0.1.tar.bz2


Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-font-utils.spec	27 Apr 2006 22:32:19 -0000	1.18
+++ xorg-x11-font-utils.spec	22 Jun 2006 03:16:41 -0000	1.19
@@ -13,20 +13,23 @@
 Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
-Version: 1.0.2
-Release: 2
+# NOTE: Keep version set to the X11Rx.y release the package is based upon.
+Version: 7.1
+# Bump release for updates.
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/bdftopcf-1.0.0.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fonttosfnt-1.0.1.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.0.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.1.tar.bz2
 Source2: http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.2.tar.bz2
-Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/mkfontscale-1.0.1.tar.bz2
-Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/font-util-1.0.0.tar.bz2
-Patch0: font-util-1.0.0-mapdir-use-datadir-fix.patch
-Patch1: font-util-1.0.0-autoconf-add-with-fontdir-option.patch
+Source3: http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.1.tar.bz2
+Source4: http://xorg.freedesktop.org/releases/individual/app/font-util-1.0.1.tar.bz2
+
+Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch
+Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch
 
 BuildRequires: pkgconfig
 # xorg-x11-libXfont-devel needed for bdftopcf
@@ -151,6 +154,10 @@
 %{_mandir}/man1/ucs2any.1x*
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:7.1-1
+- Update to font-util-1.0.1 from X11R7.1
+- Set package version to X11 release the tarballs are based from.
+
 * Thu Apr 26 2006 Adam Jackson <ajackson at redhat.com> 1:1.0.2-2
 - Update mkfontdir
 


--- font-util-1.0.0-autoconf-add-with-fontdir-option.patch DELETED ---


--- font-util-1.0.0-mapdir-use-datadir-fix.patch DELETED ---


