Merge remote branch 'origin/f13/master' into f12/master

Conflicts:
	xforms.spec

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xforms
-# $Id$
-NAME := xforms
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

xforms.spec

@@ -4,7 +4,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.92
-Release: 2.%{pre}%{?dist}
+Release: 3.%{pre}%{?dist}
 
 License: LGPLv2+
 Group:   System Environment/Libraries
@@ -27,6 +27,8 @@ BuildRequires: %{x_deps}
 Requires: netpbm-progs
 # import eps,ps (optional?)
 #Requires: ghostscript
+# eww, http://lists.nongnu.org/archive/html/xforms-development/2010-05/msg00000.html
+Requires: xorg-x11-fonts-ISO8859-1-75dpi
 
 
 %description
@@ -97,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 03 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.0.92-3.sp2
+- Requires: xorg-x11-fonts-ISO8859-1-75dpi (#589726)
+
 * Thu Nov 05 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.92-2.sp2
 - xforms-1.9.92sp2