- up to 23.4

- no need to patch for lib64 anymore, use configure option

Changed files:
    emacs-fontconfig.patch -> 1.2
    emacs-lib64.patch -> 1.3
    emacs.spec -> 1.116

diff --git a/emacs-fontconfig.patch b/emacs-fontconfig.patch
index b3bfea19881cb87a1da1ffbad7a42a160e0f0ff5..c7b72520d5e4af7e0af591c24510d7a71426c04e 100644 (file)
--- a/emacs-fontconfig.patch
+++ b/emacs-fontconfig.patch
@@ -1,14 +1,3 @@
---- emacs-23.3/configure.in~   2011-08-31 22:24:46.365226136 +0200
-+++ emacs-23.3/configure.in    2011-08-31 22:31:54.258255730 +0200
-@@ -2047,8 +2047,6 @@
-       dnl As we use Xft, we anyway use freetype.
-       dnl There's no need for additional CFLAGS and LIBS.
-       HAVE_FREETYPE=yes
--      FONTCONFIG_CFLAGS=
--      FONTCONFIG_LIBS=
-     fi
- 
-     HAVE_LIBOTF=no
 --- emacs-23.3/configure.in~   2011-08-31 22:32:43.687197466 +0200
 +++ emacs-23.3/configure.in    2011-08-31 22:38:04.288619611 +0200
 @@ -1998,6 +1998,7 @@

diff --git a/emacs-lib64.patch b/emacs-lib64.patch
deleted file mode 100644 (file)
index b64b9a7..0000000
--- a/emacs-lib64.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- emacs-22.1/src/s/gnu-linux.h.orig  2008-01-03 13:12:45.000000000 +0000
-+++ emacs-22.1/src/s/gnu-linux.h       2008-01-03 13:13:20.000000000 +0000
-@@ -168,7 +168,7 @@
- /* Ask GCC where to find libgcc.a.  */
- #define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
- 
--#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-+#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
- 
- /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
-    says where to find X windows at run time.  */
-@@ -198,7 +198,7 @@
- #define LIBS_DEBUG
- #undef LIB_GCC
- #define LIB_GCC
--#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
- 
- /* Don't use -g in test compiles in configure.
-    This is so we will use the same shared libs for that linking
-

diff --git a/emacs.spec b/emacs.spec
index d930aab9c4cb74485f9af929b0788741a4dd4959..03c6cc1549cf078f87ab3538f02d1678f2c4166c 100644 (file)
--- a/emacs.spec
+++ b/emacs.spec
@@ -18,13 +18,13 @@ Summary(pl.UTF-8):  GNU Emacs - edytor tekstu dla systemu X Window
 Summary(pt_BR.UTF-8):  GNU Emacs
 Summary(tr.UTF-8):     GNU Emacs
 Name:          emacs
-%define        ver     23.3
-Version:       %{ver}b
-Release:       6
+%define        ver     23.4
+Version:       %{ver}
+Release:       0.1
 License:       GPL v3+
 Group:         Applications/Editors/Emacs
-Source0:       ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.gz
-# Source0-md5: f2bfd8eab7e3b34a0f7f09acc0667e71
+Source0:       ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.bz2
+# Source0-md5: 070c68ad8e3c31fb3cb2414feaf5e6f0
 Source1:       %{name}-dot%{name}
 Source2:       %{name}-site-start.el
 Source3:       %{name}.png
@@ -34,7 +34,6 @@ Source6:      %{name}-athena.desktop
 Source7:       %{name}-gtk.desktop
 Source8:       %{name}-motif.desktop
 Source9:       %{name}-nox.desktop
-Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-fontconfig.patch
 URL:           http://www.gnu.org/software/emacs/
 BuildRequires: autoconf
@@ -382,9 +381,6 @@ exit 1
 %endif
 
 %setup -q -n %{name}-%{ver}
-%if "%{_lib}" == "lib64"
-%patch0 -p1
-%endif
 %patch1 -p1
 
 %build
@@ -400,6 +396,7 @@ echo "Building emacs athena binary ..."
 rm -rf build-athena
 mkdir build-athena && cd build-athena
 ../%configure \
+       --with-crt-dir=%{_libdir} \
        --with-pop \
        --with-xpm \
        --with-jpeg \
@@ -419,6 +416,7 @@ echo "Building emacs GTK+2 binary ..."
 rm -rf build-gtk
 mkdir build-gtk && cd build-gtk
 ../%configure \
+       --with-crt-dir=%{_libdir} \
        --with-pop \
        --with-xpm \
        --with-jpeg \
@@ -442,6 +440,7 @@ echo "Building emacs motif binary ..."
 rm -rf build-motif
 mkdir build-motif && cd build-motif
 ../%configure \
+       --with-crt-dir=%{_libdir} \
        --with-pop \
        --with-xpm \
        --with-jpeg \
@@ -465,6 +464,7 @@ echo "Building emacs binary without X support ..."
 [ -d build-nox ] && rm -rf build-nox
 mkdir build-nox && cd build-nox
 ../%configure \
+       --with-crt-dir=%{_libdir} \
        --with-pop \
        --without-xpm \
        --without-jpeg \