rpms/emacs-auctex/FC-5 auctex-11.83-buildsys.patch, NONE, 1.1 emacs-auctex.spec, 1.18, 1.19

Jonathan G. Underwood (jgu) fedora-extras-commits at redhat.com
Sat Jun 10 14:24:53 UTC 2006


Author: jgu

Update of /cvs/extras/rpms/emacs-auctex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25904

Modified Files:
	emacs-auctex.spec 
Added Files:
	auctex-11.83-buildsys.patch 
Log Message:
Add patch to configure script to work around a problem with the build system for
FC-5. Ugly hack, to be removed in the future.


auctex-11.83-buildsys.patch:

--- NEW FILE auctex-11.83-buildsys.patch ---
--- configure.original	2006-06-10 14:48:57.000000000 +0100
+++ configure	2006-06-10 14:56:07.000000000 +0100
@@ -1584,30 +1584,8 @@
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:$LINENO: checking if ${EMACS} is XEmacs" >&5
-echo $ECHO_N "checking if ${EMACS} is XEmacs... $ECHO_C" >&6
-
-  elisp="(if (featurep (quote xemacs)) \"yes\" \"no\")"
-  OUTPUT=./conftest-$$
-  echo "${EMACS}" -batch -no-site-file -eval "(let* ((x ${elisp})) (write-region (if (stringp x) x (prin1-to-string x)) nil \"${OUTPUT}\"))"  >& 5 2>&1
-  "${EMACS}" -batch -no-site-file -eval "(let* ((x ${elisp})) (write-region (if (stringp x) x (prin1-to-string x)) nil \"${OUTPUT}\"))"  >& 5 2>&1
-  XEMACS="`cat ${OUTPUT}`"
-  echo "=> ${XEMACS}" >& 5 2>&1
-  rm -f ${OUTPUT}
-
-if test "${XEMACS}" = "yes"; then
-  EMACS_FLAVOR=xemacs
-  EMACS_NAME="XEmacs"
-elif test "${XEMACS}" = "no"; then
   EMACS_FLAVOR=emacs
   EMACS_NAME="Emacs"
-else
-  { { echo "$as_me:$LINENO: error: Unable to run ${EMACS}!  Aborting!" >&5
-echo "$as_me: error: Unable to run ${EMACS}!  Aborting!" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-  echo "$as_me:$LINENO: result: ${XEMACS}" >&5
-echo "${ECHO_T}${XEMACS}" >&6
 
 
   echo "$as_me:$LINENO: checking for ${EMACS_NAME} prefix" >&5


Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- emacs-auctex.spec	10 Jun 2006 12:42:31 -0000	1.18
+++ emacs-auctex.spec	10 Jun 2006 14:24:53 -0000	1.19
@@ -7,11 +7,12 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.83
-Release: 	2%{?dist}
+Release: 	2%{?dist}.2
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
 Source0: 	ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz
+Patch0:		auctex-11.83-buildsys.patch
 BuildArch: 	noarch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: 	auctex
@@ -20,7 +21,7 @@
 Requires: 	emacs emacs-common ghostscript 
 Requires: 	tetex-preview = %{version}-%{release}
 Requires: 	/sbin/install-info
-BuildRequires: 	emacs emacs-common tetex-latex texinfo ghostscript
+BuildRequires: 	emacs tetex-latex texinfo ghostscript
 
 %description 
 AUCTeX is an extensible package that supports writing and formatting TeX files
@@ -72,6 +73,10 @@
 %prep
 %setup -q -n auctex-%{version}
 
+# Ugly patch to work around a build system problem with configure script for
+# FC-5 only - this removes the offending part of the configure script
+%patch0 -p0
+
 %build
 mkdir -p %{buildroot}%{previewdir}
 
@@ -149,6 +154,13 @@
 %{_datadir}/emacs/site-lisp/auctex/style/*.el
 
 %changelog
+* Sat Jun 10 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.83-2.2
+- Add patch to work around build system problem with configure
+  script auctex-11.83-buildsys.patch - FC-5 only
+
+* Sat Jun 10 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.83-2.1
+- Remove BuildRequires: emacs-common as emacs Requires emacs-common
+
 * Sat Jun 10 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.83-2
 - Add BuildRequires emacs-common
 




More information about the fedora-extras-commits mailing list