- up to 20090923

Changed files:
    fontforge-iconv-in-libc.patch -> 1.3
    fontforge-link.patch -> 1.2
    fontforge.spec -> 1.13

diff --git a/fontforge-iconv-in-libc.patch b/fontforge-iconv-in-libc.patch
deleted file mode 100644 (file)
index 64c1cc0..0000000
--- a/fontforge-iconv-in-libc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fontforge-20050310/configure.in.orig       2005-04-30 16:46:12.479221200 +0200
-+++ fontforge-20050310/configure.in    2005-04-30 17:02:34.048000064 +0200
-@@ -76,7 +76,7 @@
- AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc (Darwin uses dyld)
- AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
- if test "$gww_uselessiconv" = "no" ; then
-- AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac,solaris have libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
-+ AC_SEARCH_LIBS(iconv, iconv) dnl linux has iconv in libc, mac,solaris have libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
- fi
- 
- dnl Is there a better way to add a directory to the include path?

diff --git a/fontforge-link.patch b/fontforge-link.patch
deleted file mode 100644 (file)
index 1dd2076..0000000
--- a/fontforge-link.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- fontforge-20060822/fontforge/Makefile.dynamic.in.orig      2006-08-07 04:09:46.000000000 +0200
-+++ fontforge-20060822/fontforge/Makefile.dynamic.in   2006-09-16 15:19:44.300186750 +0200
-@@ -13,6 +13,7 @@
- LIBTOOL = @LIBTOOL@
- CC = @CC@
- 
-+LDFLAGS = @LDFLAGS@
- X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- X_11LIB = @X_11LIB@
-@@ -51,14 +52,14 @@
- CFLAGS = @CFLAGS@ $(_CFLAGS)
- 
- #I used to include -L/usr/lib explicitly after static_libs. Not sure why. Should be implied & breaks 64bit compiles
--LIBS = -rpath $(libdir) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
--    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm
-+LIBS = -rpath $(libdir) $(STATIC_LIBS) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
-+    $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ -lm
- DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
- 
- all: fontforge sfddiff
- 
- fontforge: main.o $(fontforge_LIBOBJECTS)
--      $(LIBTOOL) --mode=link $(CC) -export-dynamic -o fontforge main.o $(fontforge_LIBOBJECTS) $(LIBS)
-+      $(LIBTOOL) --mode=link $(CC) -export-dynamic -o fontforge main.o $(fontforge_LIBOBJECTS) $(LDFLAGS) $(LIBS)
- 
- sfddiff: sfddiff.pe
-       echo "#!$(bindir)/fontforge" >sfddiff
---- fontforge-20060822/gdraw/Makefile.dynamic.in.orig  2006-08-22 08:14:00.000000000 +0200
-+++ fontforge-20060822/gdraw/Makefile.dynamic.in       2006-09-16 15:12:29.164992500 +0200
-@@ -41,7 +41,7 @@
- 
- ../libgdraw.la: $(libgdraw_OBJECTS)
-       $(LIBTOOL) --mode=link $(CC) $(CFLAGS) @LDFLAGS@ -o ../libgdraw.la $(libgdraw_OBJECTS) \
--          $(STATIC_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS)  \
-+          $(STATIC_LIBS) ../libgunicode.la $(X_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) -lm \
-           -rpath $(libdir) -version-info $(GD_VERSION):$(GD_REVISION):$(GD_AGE)
- 
- %.lo: %.c
---- fontforge-20060822/configure.in.orig       2006-09-16 14:04:37.782547000 +0200
-+++ fontforge-20060822/configure.in    2006-09-16 15:17:21.123238750 +0200
-@@ -28,8 +28,6 @@
- 
-  ])
- 
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
--
- case "$host" in
- *-apple-darwin*)
-  gww_ismac="yes"
-@@ -334,8 +332,8 @@
-  dnl AC_CHECK_HEADER("X11/extensions/XI.h", : ,AC_DEFINE(_NO_XINPUT),)
-  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(Xi, XOpenDevice, X_11LIB="-lXi -lX11" ,AC_DEFINE(_NO_XINPUT), $X_LIBS $X_EXTRA_LIBS -lX11 ) 
-+ AC_CHECK_LIB(X11, XkbQueryExtension, [:] ,AC_DEFINE(_NO_XKB), $X_LIBS $X_EXTRA_LIBS -lm ) 
- fi
- 
- AC_C_LONG_DOUBLE
---- fontforge-20060822/Makefile.dynamic.in.orig        2006-07-14 22:20:20.000000000 +0200
-+++ fontforge-20060822/Makefile.dynamic.in     2006-09-16 15:52:43.479877750 +0200
-@@ -50,8 +50,8 @@
- # You may need to be root to do the install
-       mkdir -p $(libdir)
-       #-rm $(libdir)/libgdraw.so* $(libdir)/libgunicode.so.*
--      $(LIBTOOL) --mode=install $(INSTALL) -c libgdraw.la $(libdir)/libgdraw.la
-       $(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
-+      $(LIBTOOL) --mode=install $(INSTALL) -c libgdraw.la $(libdir)/libgdraw.la
-       #cp .libs/*.so.*.* $(libdir)
-       $(LIBTOOL) --mode=finish $(libdir)
-       mkdir -p $(libdir)/pkgconfig

diff --git a/fontforge.spec b/fontforge.spec
index 9d9beba10e5d72f123c4371fef13ef2c15e727df..be03d56dcc288b07e9599af8ee8c54c295284284 100644 (file)
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -1,15 +1,13 @@
 Summary:       An outline font editor
 Summary(pl.UTF-8):     Edytor fontów rysowanych
 Name:          fontforge
-Version:       20060822
+Version:       20090923
 Release:       1
 License:       BSD
 Group:         X11/Applications/Publishing
 Source0:       http://dl.sourceforge.net/fontforge/%{name}_full-%{version}.tar.bz2
-# Source0-md5: 872a8013be82e322677f7c254101544d
+# Source0-md5: ea9d8dc38de79235fbe6add725b38ffe
 Patch0:                %{name}-sonames.patch
-Patch1:                %{name}-iconv-in-libc.patch
-Patch2:                %{name}-link.patch
 URL:           http://fontforge.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -48,9 +46,9 @@ FontForge wcześniej nazywał się PfaEdit.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+# hardcoded in code is +- same as hardcoded at compile time
+#%patch0 -p1
+#%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -68,7 +66,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{gr,el}
 %find_lang FontForge
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/{*.la,pkgconfig}
@@ -83,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS LICENSE
 %attr(755,root,root) %{_bindir}/fontforge
+%attr(755,root,root) %{_bindir}/fontimage
+%attr(755,root,root) %{_bindir}/fontlint
 %attr(755,root,root) %{_bindir}/sfddiff
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/lib*.so.*
+%{_datadir}/fontforge
 %{_mandir}/man1/*