- enhanced link patch to avoid unnecessary libxkbui requirement for XkbQueryExtension...

- when using regular-link, devel package has some (well, many in fact) dependencies

diff --git a/fontforge-link.patch b/fontforge-link.patch
index e6f89dc35193bc054e7019fa649a25af45e664a1..abda7e6b42f0400e09ead21a5c8e8bade4d34beb 100644 (file)
--- a/fontforge-link.patch
+++ b/fontforge-link.patch
@@ -68,3 +68,14 @@
   if test "$ac_cv_lib_tiff_TIFFOpen" = "yes"; then
    STATIC_LIBS="$STATIC_LIBS -ltiff"
   fi
+--- fontforge-20120731-b/configure.in.orig     2012-10-07 17:41:49.342851423 +0200
++++ fontforge-20120731-b/configure.in  2012-10-07 18:59:16.455989734 +0200
+@@ -38,7 +38,7 @@
+  dnl /usr/share/doc/XFree86-doc-4.2.0/Xi/lib.PS
+ 
+  AC_CHECK_LIB(Xi, XOpenDevice, X_11LIB="-lXi -lX11" ,AC_DEFINE(_NO_XINPUT), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 ) 
+- AC_CHECK_LIB(xkbui, XkbQueryExtension, X_11LIB="$X_11LIB -lxkbui" ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm ) 
++ AC_CHECK_LIB(X11, XkbQueryExtension, X_11LIB="$X_11LIB -lX11" ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm ) 
+ fi
+ 
+ gww_define_caps_for_alt="dontknow"

diff --git a/fontforge.spec b/fontforge.spec
index 653408aa145c2f63465294ab77c552d154a0f036..f7e7c14197637db411c0719f7ddba1c996de716b 100644 (file)
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -12,7 +12,8 @@ Patch1:               %{name}-20090224-pythondl.patch
 URL:           http://fontforge.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: cairo-devel
+BuildRequires: cairo-devel >= 1.2
+BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel >= 2.0.0
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
@@ -29,6 +30,8 @@ BuildRequires:        python-devel >= 2.3
 BuildRequires: python-modules >= 2.3
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXi-devel
+BuildRequires: zlib-devel
+Requires:      cairo >= 1.2
 Requires:      iconv
 Obsoletes:     pfaedit
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,6 +58,20 @@ Summary:     Header files for FontForge libraries
 Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek FontForge
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      cairo-devel >= 1.2
+Requires:      fontconfig-devel
+Requires:      freetype-devel >= 2.0.0
+Requires:      giflib-devel
+Requires:      libjpeg-devel
+Requires:      libpng-devel
+Requires:      libspiro-devel
+Requires:      libtiff-devel
+Requires:      libuninameslist-devel
+Requires:      libxml2-devel
+Requires:      pango-devel
+Requires:      xorg-lib-libX11-devel
+Requires:      xorg-lib-libXi-devel
+Requires:      zlib-devel
 
 %description devel
 Header files for FontForge libraries.