rpms/ttmkfdir/devel ttmkfdir-3.0.9-encoding-dir.patch, 1.2, 1.3 ttmkfdir.spec, 1.33, 1.34

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/ttmkfdir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8180

Modified Files:
	ttmkfdir-3.0.9-encoding-dir.patch ttmkfdir.spec 
Log Message:
simplify ttmkfdir-3.0.9-encoding-dir.patch to drop X11R6/ check (#173705)

ttmkfdir-3.0.9-encoding-dir.patch:

Index: ttmkfdir-3.0.9-encoding-dir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ttmkfdir/devel/ttmkfdir-3.0.9-encoding-dir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ttmkfdir-3.0.9-encoding-dir.patch	19 Jun 2006 10:29:00 -0000	1.2
+++ ttmkfdir-3.0.9-encoding-dir.patch	24 Jun 2009 07:09:21 -0000	1.3
@@ -5,35 +5,16 @@
      cerr << "This Program is (C) Joerg Pommnitz, 2000" << endl;
      cerr << "Usage: " << program << " [OPTION]" << endl;
 -    cerr << "-e, --encoding\t\tname of the encoding directory file, default is \"/usr/X11R6/lib/X11/fonts/encodings/encodings.dir\"" << endl;
-+    cerr << "-e, --encoding\t\tname of the encoding directory file, default is \"/usr/X11R6/lib/X11/fonts/encodings/encodings.dir\" or \"/usr/share/X11/fonts/encodings/encodings.dir\"" << endl;
++    cerr << "-e, --encoding\t\tname of the encoding directory file, default is \"/usr/share/X11/fonts/encodings/encodings.dir\"" << endl;
      cerr << "-o, --output\t\tname of the destination file, default is \"fonts.scale\"" << endl;
      cerr << "-d, --font-dir\t\tname of the TrueType font directory, default is \".\"" << endl;
      cerr << "-f, --default-foundry\tname of the default font foundry, default is \"misc\"" << endl;
-@@ -32,7 +32,26 @@
+@@ -32,7 +32,7 @@
  void
  ParseCommandline (int argc, char *argv[])
  {
 -    cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/X11R6/lib/X11/fonts/encodings/encodings.dir"));
-+    FILE *tmp = fopen ("/usr/X11R6/lib/X11/fonts/encodings/encodings.dir", "r");
-+    if (tmp)
-+    {
-+	cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/X11R6/lib/X11/fonts/encodings/encodings.dir"));
-+	fclose (tmp);
-+    }
-+    else
-+    {
-+        tmp = fopen ("/usr/share/X11/fonts/encodings/encodings.dir", "r");
-+	if (tmp)
-+	{
-+	    cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/share/X11/fonts/encodings/encodings.dir"));
-+	    fclose (tmp);
-+	}
-+	else
-+	{
-+	    cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/X11R6/lib/X11/fonts/encodings/encodings.dir"));
-+	}
-+    }
-+    
++    cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/share/X11/fonts/encodings/encodings.dir"));
      cmdline::instance()->AddOption (new Commandline::Option ("output", 'o', "fonts.scale"));
      cmdline::instance()->AddOption (new Commandline::Option ("font-dir", 'd', "."));
      cmdline::instance()->AddOption (new Commandline::Option ("default-foundry", 'f', "misc"));


Index: ttmkfdir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ttmkfdir/devel/ttmkfdir.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ttmkfdir.spec	3 Mar 2009 14:27:23 -0000	1.33
+++ ttmkfdir.spec	24 Jun 2009 07:09:21 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Utility to create fonts.scale files for truetype fonts
 Name: ttmkfdir
 Version: 3.0.9
-Release: 30%{?dist}
+Release: 31%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ttmkfdir
 
 %changelog
+* Wed Jun 24 2009 Jens Petersen <petersen at redhat.com> - 3.0.9-31
+- simplify ttmkfdir-3.0.9-encoding-dir.patch to drop X11R6/ check (#173705)
+
 * Tue Mar 03 2009 Caolán McNamara <caolanm at redhat.com> - 3.0.9-30
 - fix ttmkfdir-3.0.9-segfaults.patch to include stdio.h for added printf