rpms/emacs-bbdb/F-9 bbdb-2.35-fix_lisp_makefile.patch, NONE, 1.1 emacs-bbdb.spec, 1.3, 1.4 sources, 1.4, 1.5

Sun Nov 9 13:20:16 UTC 2008

Author: jgu

Update of /cvs/extras/rpms/emacs-bbdb/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30186

Modified Files:
	emacs-bbdb.spec sources 
Added Files:
	bbdb-2.35-fix_lisp_makefile.patch 
Log Message:
* Sun Nov  9 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:2.35-1
- Revert to 2.35 release in order to address BZ 467909 and 467911
- Add bbdb-2.35-fix_lisp_makefile.patch in order to fix build problems
- Add epoch to avoid problems with package updating


bbdb-2.35-fix_lisp_makefile.patch:

--- NEW FILE bbdb-2.35-fix_lisp_makefile.patch ---
diff -up bbdb-2.35/lisp/Makefile.in.fix_lisp_makefile bbdb-2.35/lisp/Makefile.in
--- bbdb-2.35/lisp/Makefile.in.fix_lisp_makefile	2006-02-08 22:37:16.000000000 +0000
+++ bbdb-2.35/lisp/Makefile.in	2008-11-09 12:55:35.000000000 +0000
@@ -20,19 +20,14 @@ SYMLINKS = @SYMLINKS@
 LINKPATH = @LINKPATH@
 
 # this is lovely, isn't it?  Surprisingly enough, it seems to work...
-VM	= -eval '(progn (if (not (string-match "$(VMDIR)" ""))            \
-			    (setq load-path (cons "$(VMDIR)" load-path))) \
-			(if (load "vm-version" t t)                         \
-			    (cond ((> (string-to-number vm-version) 5.31) \
-                                   (load "vm" t t))                           \
-                                  (t (load "vm-vars" t t) (load "vm" t t)))))'
-
-GNUS	= -eval '(if (not (string-match "$(GNUSDIR)" ""))             \
-		     (setq load-path (cons "$(GNUSDIR)" load-path)))'
-
-MHE	= -eval '(progn (if (not (string-match "$(MHEDIR)" ""))            \
-			    (setq load-path (cons "$(MHEDIR)" load-path))) \
-			(load "mh-e" t t))'
+VM	= -eval '(if (> (length "$(VMDIR)") 0) \
+		   (setq load-path (cons "$(VMDIR)" load-path)))'
+
+GNUS	= -eval '(if (> (length "$(GNUSDIR)") 0) \
+	           (setq load-path (cons "$(GNUSDIR)" load-path)))'
+
+MHE	= -eval '(if (> (length "$(MHEDIR)") 0) \
+	           (setq load-path (cons "$(MHEDIR)" load-path)))'
 
 PUSHPATH=-l @top_srcdir@/@BBDB_LOADPATH@
 
@@ -50,8 +45,7 @@ BINS=		bbdb.elc $(DEPBINS)
 all: Makefile @BBDB_RMAIL@ @BBDB_GNUS@ @BBDB_VM@ @BBDB_MHE@ bbdb autoloadsc
 
 Makefile: Makefile.in
-	@echo "Makefile.in has changed, rerun configure!"
-	exit 1
+	cd ..; ./config.status
 
 install-pkg: uninstall-pkg bbdb autoloadsc
 	@if test "x$(SYMLINKS)" = "xno" ; then                 \
@@ -143,10 +137,7 @@ bbdb-sc.elc: bbdb.elc bbdb-sc.el
 
 bbdb-hooks.elc:  bbdb.elc bbdb-hooks.el
 	@HUSHMAKE@$(EMACS_PROG) -batch -q $(PUSHPATH) -l ./bbdb.elc \
-	-eval '(and (not (string= "$(VMDIR)" "")) \
-		    (setq load-path (cons "$(VMDIR)" load-path)) \
-		    (load "vm" t t) \
-		    (load "vm-vars" t t))' \
+	-eval '(and (not (string= "$(VMDIR)" "")) (setq load-path (cons "$(VMDIR)" load-path)) (load "vm" t t) (load "vm-vars" t t))' \
 	-f batch-byte-compile $(@:.elc=.el)
 
 autoloads: bbdb-autoloads.el


Index: emacs-bbdb.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/F-9/emacs-bbdb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-bbdb.spec	6 Nov 2008 23:14:42 -0000	1.3
+++ emacs-bbdb.spec	9 Nov 2008 13:19:45 -0000	1.4
@@ -10,13 +10,6 @@
 %define emacs_startdir %(pkg-config emacs --variable sitestartdir)
 %endif
 
-# Note on CVS snapshot: we now package a post 2.35 release CVS snapshot of
-# upstream development leading to 2.36. Tarball produced by:
-# 1. cvs -d :pserver:anonymous at bbdb.cvs.sourceforge.net:/cvsroot/bbdb login
-# 2. cvs -d :pserver:anonymous at bbdb.cvs.sourceforge.net:/cvsroot/bbdb checkout bbdb
-# 3. cd bbdb ; autonconf ; ./configure ; make tar
-%define cvs_ver 20080928cvs
- 
 # Note on building bbdb with support for VM: if support for VM in bbdb is
 # required, then the source elisp for VM must be installed at build time. If
 # support for BBDB is required in VM, then the BBDB source elisp must be present
@@ -31,18 +24,20 @@
 	
 
 Name:           emacs-bbdb
-Version:        2.36
-Release:        0.1.%{cvs_ver}%{?dist}
+Version:        2.35
+Release:        1%{?dist}
+Epoch:		1
 Summary:        A contact management utility for use with Emacs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bbdb.sourceforge.net/
 Requires:       emacs(bin) >= %{emacs_version}
 
-Source0:        bbdb-2.36.%{cvs_ver}.tar.gz
-# This patch reverts commit 106 - commit 106 only works with VM >= 8.1.0
-# http://bbdb.cvs.sourceforge.net/viewvc/bbdb/bbdb/lisp/bbdb-vm.el?r1=1.105&r2=1.106
-Patch0:		bbdb-2.36-revert106.patch
+Source0:        bbdb-2.35.tar.gz
+
+# This patch pulls in upstream changes to Makefile.in in the lisp directory (up
+# to revision 1.17). No need to upstream therefore, and should be removed for bbdb-2.36
+Patch0:		bbdb-2.35-fix_lisp_makefile.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,13 +67,13 @@
 %package -n %{name}-el
 Summary:        Lisp source files for bbdb for Emacs
 Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description -n %{name}-el
 This package contains the Emacs lisp source files for %{name}. 
 
 %prep 
-%setup -q -n bbdb-2.36
+%setup -q -n bbdb-%{version}
 
 # Correct encoding of info file and ChangeLog
 for i in texinfo/bbdb.texinfo ChangeLog ; do
@@ -86,7 +81,7 @@
     mv $i.new $i
 done
 
-%patch0 -p1 -b .revert106
+%patch0 -p 1 -b .fix_lisp_makefile
 
 %build
 # Note --enable-developer simply gives more verbose output during building,
@@ -151,6 +146,11 @@
 %{lispdir}/*.el
 
 %changelog
+* Sun Nov  9 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:2.35-1
+- Revert to 2.35 release in order to address BZ 467909 and 467911
+- Add bbdb-2.35-fix_lisp_makefile.patch in order to fix build problems
+- Add epoch to avoid problems with package updating
+
 * Thu Nov  6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.36-0.1.20080928cvs
 - Rename snapshot to reflect the fact that it is a 2.36 pre-release rather than
   a post 2.35 snapshot


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2008 23:14:42 -0000	1.4
+++ sources	9 Nov 2008 13:19:45 -0000	1.5
@@ -1 +1 @@
-3edf3378898af66f7505f64f2ec2eddc  bbdb-2.36.20080928cvs.tar.gz
+5c4e7f2b2a6a8e25ff77351f533f3910  bbdb-2.35.tar.gz


