- no more separated libtinfo(w)

Changed files:
    emacs-tinfo.patch -> 1.3
    emacs.spec -> 1.111

diff --git a/emacs-tinfo.patch b/emacs-tinfo.patch
deleted file mode 100644 (file)
index 7040a32..0000000
--- a/emacs-tinfo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN emacs-22.1.org/configure.in emacs-22.1/configure.in
---- emacs-22.1.org/configure.in        2007-05-25 14:43:29.000000000 +0200
-+++ emacs-22.1/configure.in    2007-06-10 16:55:37.848243540 +0200
-@@ -2622,7 +2622,7 @@
- # That is because we have not set up to link ncurses in lib-src.
- # It's better to believe a function is not available
- # than to expect to find it in ncurses.
--AC_CHECK_LIB(ncurses, tparm)
-+AC_CHECK_LIB(tinfo, tparm)
- 
- # Do we need the Hesiod library to provide the support routines?
- if test "$with_hesiod" = yes ; then
---- emacs-22.1/src/s/gnu-linux.h.old   2007-06-10 20:13:53.376467108 +0200
-+++ emacs-22.1/src/s/gnu-linux.h       2007-06-10 20:17:32.624547726 +0200
-@@ -279,9 +279,9 @@
- /* Paul Abrahams <abrahams@equinox.shaysnet.com> says this is needed.  */
- #define LIB_MOTIF -lXm -lXpm
- 
--#ifdef HAVE_LIBNCURSES
-+#ifdef HAVE_LIBTINFO
- #define TERMINFO
--#define LIBS_TERMCAP -lncurses
-+#define LIBS_TERMCAP -ltinfo
- #endif
- 
- #define HAVE_SYSVIPC

diff --git a/emacs.spec b/emacs.spec
index 399b279c20fac8cedb84d5482f1e4db88bb25292..f2a174d077b725bdf6c7f2d5082deeb7935886fe 100644 (file)
--- a/emacs.spec
+++ b/emacs.spec
@@ -33,9 +33,8 @@ Source6:      %{name}-athena.desktop
 Source7:       %{name}-gtk.desktop
 Source8:       %{name}-motif.desktop
 Source9:       %{name}-nox.desktop
-Patch0:                %{name}-tinfo.patch
-Patch1:                %{name}-lib64.patch
-Patch2:                %{name}-fontconfig.patch
+Patch0:                %{name}-lib64.patch
+Patch1:                %{name}-fontconfig.patch
 URL:           http://www.gnu.org/software/emacs/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -382,11 +381,10 @@ exit 1
 %endif
 
 %setup -q -n %{name}-%{ver}
-%patch0 -p1
 %if "%{_lib}" == "lib64"
-%patch1 -p1
+%patch0 -p1
 %endif
-%patch2 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.* .