updated emacs24-vl.spec and ibus-el-vl.spec: supported emacs-24.0.90 (emacs-24.1 pretest)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4868 ec354946-7b23-47d6-9f5a-488ba84defc7

e/emacs24/emacs24-vl.spec

@@ -1,6 +1,6 @@
-%define emacsversion 24.0.50
-%define bzrdate 20110604
-%define emacsrelease 9%{?bzrdate:.%bzrdate}%{?_dist_release}
+%define emacsversion 24.0.90
+#% define bzrdate 20110817
+%define emacsrelease 2%{?bzrdate:.%bzrdate}%{?_dist_release}
 %define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
 
 %define _noVersionedDependencies 1
@@ -16,8 +16,8 @@ Name:         emacs24
 Provides:     emacs-snapshot
 Version:      %{emacsversion}
 Release:      %{emacsrelease}
-Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?bzrdate:.bzr%bzrdate}.tar.xz
-#Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.gz
+#Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?bzrdate:.bzr%bzrdate}.tar.xz
+Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.gz
 Source1:      emacs-snapshot.sh
 
 Source10:     site-start.el.emacs24
@@ -41,6 +41,7 @@ Source151:    vine-default-faces.el
 #Patch10:      emacs-21.1-ppc-nocombreloc.patch
 Patch11:      emacs-23.0.60-locallisppath.patch
 Patch20:      emacs-23.1.90-fixed-resolution.patch
+Patch30:      emacs-24.0.90-libs-termcap.patch
 
 # Fixed in upstream CVS. (from Fedora)
 
@@ -76,13 +77,15 @@ BuildRequires: atk-devel
 BuildRequires: dbus-devel GConf2-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: gnutls-devel
-BuildRequires: gtk2-devel, cairo-devel
-BuildRequires: freetype-devel, fontconfig-devel
+BuildRequires: gtk3-devel, cairo-devel
+BuildRequires: freetype2-devel, fontconfig-devel
 BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel, libungif-devel
 BuildRequires: librsvg2-devel, libotf-devel
+BuildRequires: ImageMagick-devel
+BuildRequires: libxml2-devel > 2.6.17
 BuildRequires: m17n-lib-devel
 BuildRequires: libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel
-BuildRequires: libXt-devel, libXpm-devel, ncurses-devel
+BuildRequires: libSM-devel, libXt-devel, libXpm-devel, ncurses-devel
 BuildRequires: xorg-x11-proto-devel, zlib-devel
 BuildRequires: texinfo
 BuildRequires: nkf
@@ -105,6 +108,7 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
 
 %patch11 -p1
 %patch20 -p1
+%patch30 -p1
 
 %patch1001 -p1
 
@@ -120,7 +124,7 @@ export PATH="$PATH:/sbin:/usr/sbin"
 %configure --with-pop --with-sound \
     --libexecdir=%{_libdir} --infodir=%{infodir} \
     --disable-rename \
-    --with-toolkit=gtk \
+    --with-x-toolkit=gtk3 \
     --with-freetype --with-xft \
     --enable-font-backend \
     --without-gpm \
@@ -353,7 +357,8 @@ unset PRIORITY
 
 %files -f rpm-files 
 %defattr(-,root,root)
-%doc INSTALL INSTALL.BZR README BUGS ChangeLog COPYING
+%doc INSTALL README BUGS ChangeLog COPYING
+#%doc INSTALL.BZR
 %dir %{_sysconfdir}/emacs-%{version}
 %dir %{_sysconfdir}/emacs-%{version}/site-start.d
 %{_sysconfdir}/emacs-%{version}/site-start.d/*.el
@@ -368,6 +373,18 @@ unset PRIORITY
 
 
 %changelog
+* Thu Oct  6 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.90-2
+- set --with-x-toolkit=gtk3 (%%configure)
+  - added BuildRequires: gtk3-devel
+
+* Mon Sep 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.90-1
+- updated to 24.0.90 (24.1 pretest)
+- applied emacs-24.0.90-libs-termcap.patch
+
+* Sat Jul 09 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-10.20110817
+- emacs24 24.0.50 (20110817) snapshot
+- added BuildRequires: ImageMagick-devel, libSM-devel, libxml2-devel > 2.6.17
+
 * Sun Jun 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-9.20110604
 - emacs24 24.0.50 (20110604) snapshot
 

i/ibus-el/ibus-el-init.el

@@ -10,7 +10,8 @@
 
 (add-hook 'vine-default-setup-hook
           (lambda()
-            (if vine-default-ibus-el
-                (require 'vine-default-ibus-el))))
+            (when vine-default-ibus-el
+	      (message "Loading vine-default-yatex ...")
+	      (require 'vine-default-ibus-el))))
 
 ;;; end of file

i/ibus-el/ibus-el-vl.spec

@@ -7,7 +7,7 @@ Summary:      a IBus client for GNU Emacs
 Summary(ja):  GNU Emacs 用 IBus クライアント
 Name:         %{origname}
 Version:      %{origver}
-Release:      2%{?_dist_release}
+Release:      3%{?_dist_release}
 
 # http://launchpad.net/ibus.el
 Source0:      ibus-el-%{version}.tar.gz
@@ -16,6 +16,9 @@ Source2:      %{origname}-remove.sh
 Source3:      vine-default-%{origname}.el
 Source4:      %{origname}-init.el
 
+#
+Patch0:       ibus-el-0.2.1-emacs-24.0.90.patch
+
 License:      GPLv3
 Group:        Applications/Editors/Emacs
 URL:          http://www11.atwiki.jp/s-irie/pages/21.html
@@ -44,6 +47,8 @@ comfortably by using it.
 
 %setup -q -n %{origname}-%{origver}
 
+%patch0 -p1 -b .emacs24
+
 %build
 
 %install
@@ -111,6 +116,11 @@ fi
 %{_datadir}/%{name}/ibus-el-agent
 
 %changelog
+* Mon Oct  3 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.2.1-3
+- supported emacs-24.0.90
+- updated ibus-el-init.el
+  - output "Loading vine-default-ibus-el ..." to the buffer *Messages*
+
 * Tue Apr  5 2011 IWAI, Masaharu <iwai@alib.jp> 0.2.1-2vl6
 - fix <BTS:VineLinux:1117>
  - update vine-default-ibus-el.el (Source3): sync [VineSeed:22997]