[emacs] Build with gpm and liblockfile support. Drop ssl.el (superseded by tls.el). Update php-mode to 1.5.0

[Ville Skyttä]

commit 95d80cf0cf1e60aad6ba2723034340dd7abb4bb4
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Nov 7 17:26:21 2011 +0200

    Build with gpm and liblockfile support.
    Drop ssl.el (superseded by tls.el).
    Update php-mode to 1.5.0.

 .gitignore  |    3 +-
 emacs.spec  |   14 +-
 php-mode.el | 1121 -----------------------------------------------------------
 sources     |    1 +
 ssl.el      |  201 -----------
 5 files changed, 11 insertions(+), 1329 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3eda4ad..2642e85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-emacs-23.2.tar.bz2
-/emacs-23.3.tar.bz2
 /emacs-23.3a.tar.bz2
+/php-mode.el
diff --git a/emacs.spec b/emacs.spec
index be58e3b..81ae366 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -12,9 +12,8 @@ Source1: emacs.desktop
 Source2: emacsclient.desktop
 Source3: dotemacs.el
 Source4: site-start.el
-Source7: http://php-mode.svn.sourceforge.net/svnroot/php-mode/tags/php-mode-1.4.0/php-mode.el
+Source7: http://php-mode.svn.sourceforge.net/svnroot/php-mode/tags/php-mode-1.5.0/php-mode.el
 Source8: php-mode-init.el
-Source9: ssl.el
 # rpm-spec-mode from XEmacs
 Source10: rpm-spec-mode.el
 Source11: rpm-spec-mode-init.el
@@ -36,7 +35,7 @@ BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmc
 BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel
 BuildRequires: librsvg2-devel, m17n-lib-devel, libotf-devel
 BuildRequires: autoconf, automake, bzip2, cairo, texinfo, gzip
-BuildRequires: GConf2-devel, alsa-lib-devel
+BuildRequires: GConf2-devel, alsa-lib-devel, gpm-devel, liblockfile-devel
 # Desktop integration
 BuildRequires: desktop-file-utils
 # Buildrequire both python2 and python3 since below we turn off the
@@ -154,7 +153,7 @@ packages that add functionality to Emacs.
 %patch6 -p0 -b .hideshow-comment
 
 # Install site-lisp files
-cp %SOURCE7 %SOURCE9 %SOURCE10 site-lisp
+cp %SOURCE7 %SOURCE10 site-lisp
 pushd site-lisp
 %patch1 -p0
 %patch3 -p0
@@ -431,6 +430,11 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Sat Oct 22 2011 Ville Skyttä <ville.skytta at iki.fi> - 1:23.3-11
+- Build with gpm and liblockfile support.
+- Drop ssl.el (superseded by tls.el).
+- Update php-mode to 1.5.0.
+
 * Tue Sep 27 2011 Karel Klíč <kklic at redhat.com> - 1:23.3-10
 - Keep COPYING and NEWS in the etc subdir, and symlinks in the docs (rhbz#714212)
   Author: fedora.dm0 at gmail.com
diff --git a/sources b/sources
index 863be42..b9cc07c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 f2cf8dc6f28f8ae59bc695b4ddda339c  emacs-23.3a.tar.bz2
+d9a1e06bb579950c58fd3c1d8e813ce6  php-mode.el