X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=emacs.spec;h=d930aab9c4cb74485f9af929b0788741a4dd4959;hb=270ef2ae50cdca60270eaf855c86a7206b4ee053;hp=dd3f8311febd54934051eff4a4a9a46c40a65d93;hpb=81da00ddbc4e81e88c346ba91bcf5764d4725500;p=packages%2Femacs.git

diff --git a/emacs.spec b/emacs.spec
index dd3f831..d930aab 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -4,11 +4,12 @@
 # - package ctags/etags in subpackage?
 #
 # Conditional build:
-%bcond_without	athena	# don't build athena version
-%bcond_without	gtk	# don't build GTK+2 version
-%bcond_without	motif	# don't build motif version
-%bcond_without	nox	# don't build nox version
-
+%bcond_without	athena		# don't build athena version
+%bcond_without	gtk		# don't build GTK+2 version
+%bcond_without	motif		# don't build motif version
+%bcond_without	nox		# don't build nox version
+%bcond_with	bootstrap	# build bootsrtap version
+#
 Summary:	The Emacs text editor for the X Window System
 Summary(de.UTF-8):	GNU Emacs
 Summary(es.UTF-8):	GNU Emacs
@@ -18,12 +19,12 @@ Summary(pt_BR.UTF-8):	GNU Emacs
 Summary(tr.UTF-8):	GNU Emacs
 Name:		emacs
 %define	ver	23.3
-Version:	%{ver}a
-Release:	0.1
+Version:	%{ver}b
+Release:	6
 License:	GPL v3+
 Group:		Applications/Editors/Emacs
 Source0:	ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.gz
-# Source0-md5:	20aef9ea5b5bf8050d39f8b1e96a1c04
+# Source0-md5:	f2bfd8eab7e3b34a0f7f09acc0667e71
 Source1:	%{name}-dot%{name}
 Source2:	%{name}-site-start.el
 Source3:	%{name}.png
@@ -33,9 +34,8 @@ Source6:	%{name}-athena.desktop
 Source7:	%{name}-gtk.desktop
 Source8:	%{name}-motif.desktop
 Source9:	%{name}-nox.desktop
-Patch0:		%{name}-tinfo.patch
-Patch1:		%{name}-lib64.patch
-Patch2:		%{name}-fontconfig.patch
+Patch0:		%{name}-lib64.patch
+Patch1:		%{name}-fontconfig.patch
 URL:		http://www.gnu.org/software/emacs/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -62,6 +62,7 @@ BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXpm-devel
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	ctags
+Suggests:	emacsen-gnus-pkg-emacs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -381,11 +382,10 @@ exit 1
 %endif
 
 %setup -q -n %{name}-%{ver}
-%patch0 -p1
 %if "%{_lib}" == "lib64"
-%patch1 -p1
+%patch0 -p1
 %endif
-%patch2 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -406,7 +406,8 @@ mkdir build-athena && cd build-athena
 	--with-tiff \
 	--with-gif \
 	--with-png \
-	--with-x-toolkit=athena
+	--with-x-toolkit=athena \
+	%{?with_bootstrap:--without-gpm}
 
 %{__make} -j1 bootstrap
 %define	bootstrap athena
@@ -424,7 +425,8 @@ mkdir build-gtk && cd build-gtk
 	--with-tiff \
 	--with-gif \
 	--with-png \
-	--with-x-toolkit=gtk
+	--with-x-toolkit=gtk \
+	%{?with_bootstrap:--without-gpm}
 
 %if %{?bootstrap}
 %{__make}
@@ -446,7 +448,8 @@ mkdir build-motif && cd build-motif
 	--with-tiff \
 	--with-gif \
 	--with-png \
-	--with-x-toolkit=motif
+	--with-x-toolkit=motif \
+	%{?with_bootstrap:--without-gpm}
 
 %if %{?bootstrap}
 %{__make}
@@ -468,7 +471,8 @@ mkdir build-nox && cd build-nox
 	--without-tiff \
 	--without-gif \
 	--without-png \
-	--with-x=no
+	--with-x=no \
+	%{?with_bootstrap:--without-gpm}
 
 %if %{?bootstrap}
 %{__make}
@@ -603,6 +607,10 @@ fi
 %dir %{_datadir}/emacs/%{ver}/leim
 %dir %{_datadir}/emacs/%{ver}/lisp/calc
 %dir %{_datadir}/emacs/%{ver}/lisp/calendar
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/ede
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/semantic
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/srecode
 %dir %{_datadir}/emacs/%{ver}/lisp/emacs-lisp
 %dir %{_datadir}/emacs/%{ver}/lisp/emulation
 %dir %{_datadir}/emacs/%{ver}/lisp/eshell
@@ -640,6 +648,14 @@ fi
 %{_datadir}/emacs/%{ver}/lisp/international/README
 %{_datadir}/emacs/%{ver}/lisp/language/*.el
 %{_datadir}/emacs/%{ver}/lisp/language/*.elc
+#%{_datadir}/emacs/%{ver}/lisp/cedet/*.el
+%{_datadir}/emacs/%{ver}/lisp/cedet/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/ede/*.el
+%{_datadir}/emacs/%{ver}/lisp/cedet/ede/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/*.el
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/srecode/*.el
+%{_datadir}/emacs/%{ver}/lisp/cedet/srecode/*.elc
 %{_datadir}/emacs/%{ver}/lisp/mail/blessmail.el
 %{_datadir}/emacs/%{ver}/lisp/mail/*.elc
 %{_datadir}/emacs/%{ver}/lisp/mh-e/*.el