[vala] Drop emacs bindings that no longer build

Kalev Lember kalev at fedoraproject.org
Sat Feb 21 13:36:17 UTC 2015


commit 094ea4257875e07bd2a4de11eb1673a77ac5ef31
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sat Feb 21 14:29:46 2015 +0100

    Drop emacs bindings that no longer build

 emacs-vala-COPYING | 339 ---------------------------------------------
 vala-init.el       |   5 -
 vala-mode.el       | 398 -----------------------------------------------------
 vala.spec          |  57 +-------
 4 files changed, 6 insertions(+), 793 deletions(-)
---
diff --git a/vala.spec b/vala.spec
index 6c0c1f1..cf95f9c 100644
--- a/vala.spec
+++ b/vala.spec
@@ -3,7 +3,7 @@
 
 Name:           vala
 Version:        0.27.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A modern programming language for GNOME
 
 # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD
@@ -14,9 +14,6 @@ URL:            http://live.gnome.org/Vala
 # as it breaks Colin Walters' automatic build script
 # see https://bugzilla.redhat.com/show_bug.cgi?id=609292
 Source0:        http://download.gnome.org/sources/vala/0.27/vala-%{version}.tar.xz
-Source1:        vala-mode.el
-Source2:        vala-init.el
-Source3:        emacs-vala-COPYING
 
 BuildRequires:  flex
 BuildRequires:  bison
@@ -25,9 +22,6 @@ BuildRequires:  libxslt
 # only if Vala source files are patched
 # BuildRequires:  vala
 
-# for Emacs modes
-BuildRequires:  emacs emacs-el
-
 # for tests
 # BuildRequires:  dbus-x11
 
@@ -43,6 +37,8 @@ Requires(preun):       %{_sbindir}/alternatives
 # From rhughes-f20-gnome-3-12 copr
 Obsoletes: compat-vala022 < 0.24
 %endif
+Obsoletes: emacs-vala < 0.27.1
+Obsoletes: emacs-vala-el < 0.27.1
 
 %description
 Vala is a new programming language that aims to bring modern programming
@@ -108,30 +104,6 @@ applications and libraries written in C.
 This package contains documentation in a devhelp HTML book.
 
 
-%package -n emacs-%{name}
-Summary:        Vala mode for Emacs
-License:        GPLv2+
-
-BuildArch:      noarch
-Requires:       emacs(bin) >= %{_emacs_version}
-
-%description -n emacs-%{name}
-An Emacs mode for editing Vala source code.
-
-
-%package -n emacs-%{name}-el
-Summary:        Elisp source files for emacs-%{name}
-License:        GPLv2+
-
-BuildArch:      noarch
-Requires:       emacs-%{name} = %{version}-%{release}
-
-%description -n emacs-%{name}-el
-This package contains the elisp source files for Vala under GNU
-Emacs. You do not need to install this package to run Vala. Install
-the emacs-%{name} package to use Vala with GNU Emacs.
-
-
 %prep
 %setup -q
 
@@ -141,11 +113,6 @@ the emacs-%{name} package to use Vala with GNU Emacs.
 # Don't use rpath!
 sed -i 's|/lib /usr/lib|/lib /usr/lib /lib64 /usr/lib64|' libtool
 make %{?_smp_mflags}
-# Compile emacs module
-mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} .
-%{_emacs_bytecompile} vala-mode.el
-# and copy its licensing file
-cp -p %{SOURCE3} COPYING
 
 
 %install
@@ -165,12 +132,6 @@ done
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/vala/vapi
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-# Emacs mode files
-mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
-cp -p emacs-vala/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
-
 
 %check
 # make check
@@ -267,17 +228,11 @@ done
 %files doc
 %doc %{_datadir}/devhelp/books/vala-%{api_ver}
 
-%files -n emacs-%{name}
-%doc emacs-vala/COPYING
-%dir %{_emacs_sitelispdir}/%{name}
-%{_emacs_sitelispdir}/%{name}/*.elc
-%{_emacs_sitestartdir}/*.el
-
-%files -n emacs-%{name}-el
-%{_emacs_sitelispdir}/%{name}/*.el
-
 
 %changelog
+* Sat Feb 21 2015 Kalev Lember <kalevlember at gmail.com> - 0.27.1-2
+- Drop emacs bindings that no longer build
+
 * Mon Jan 19 2015 Richard Hughes <rhughes at redhat.com> - 0.27.1-1
 - Update to 0.27.1
 


More information about the scm-commits mailing list