Author: baggins Date: Tue May 8 11:12:16 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 23.4
- no need to patch for lib64 anymore, use configure option
---- Files affected:
packages/emacs:
emacs-fontconfig.patch (1.1 -> 1.2) , emacs.spec (1.115 -> 1.116) ,
emacs-lib64.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/emacs/emacs-fontconfig.patch
diff -u packages/emacs/emacs-fontconfig.patch:1.1
packages/emacs/emacs-fontconfig.patch:1.2
--- packages/emacs/emacs-fontconfig.patch:1.1 Wed Aug 31 22:53:18 2011
+++ packages/emacs/emacs-fontconfig.patch Tue May 8 13:12:11 2012
@@ -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 @@
================================================================
Index: packages/emacs/emacs.spec
diff -u packages/emacs/emacs.spec:1.115 packages/emacs/emacs.spec:1.116
--- packages/emacs/emacs.spec:1.115 Sat Feb 11 09:23:31 2012
+++ packages/emacs/emacs.spec Tue May 8 13:12:11 2012
@@ -19,13 +19,13 @@
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
@@ -35,7 +35,6 @@
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
@@ -383,9 +382,6 @@
%endif
%setup -q -n %{name}-%{ver}
-%if "%{_lib}" == "lib64"
-%patch0 -p1
-%endif
%patch1 -p1
%build
@@ -401,6 +397,7 @@
rm -rf build-athena
mkdir build-athena && cd build-athena
../%configure \
+ --with-crt-dir=%{_libdir} \
--with-pop \
--with-xpm \
--with-jpeg \
@@ -420,6 +417,7 @@
rm -rf build-gtk
mkdir build-gtk && cd build-gtk
../%configure \
+ --with-crt-dir=%{_libdir} \
--with-pop \
--with-xpm \
--with-jpeg \
@@ -443,6 +441,7 @@
rm -rf build-motif
mkdir build-motif && cd build-motif
../%configure \
+ --with-crt-dir=%{_libdir} \
--with-pop \
--with-xpm \
--with-jpeg \
@@ -466,6 +465,7 @@
[ -d build-nox ] && rm -rf build-nox
mkdir build-nox && cd build-nox
../%configure \
+ --with-crt-dir=%{_libdir} \
--with-pop \
--without-xpm \
--without-jpeg \
@@ -771,6 +771,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.116 2012/05/08 11:12:11 baggins
+- up to 23.4
+- no need to patch for lib64 anymore, use configure option
+
Revision 1.115 2012/02/11 08:23:31 arekm
- release 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/emacs/emacs-fontconfig.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/emacs/emacs.spec?r1=1.115&r2=1.116
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
