[evolution-couchdb] Do not call autoreconf, patch files directly

Milan Crha mcrha at fedoraproject.org
Wed Jan 12 20:44:01 UTC 2011 

commit ddac2fdd485b3111296dd3184f4e5787a7612249
Author: Milan Crha <mcrha at redhat.com>
Date:   Wed Jan 12 21:43:17 2011 +0100

    Do not call autoreconf, patch files directly

 eds_2_91_5.patch       |  172 ++++++++++++++++++++++++++++++++++++++++++++++-
 evolution-couchdb.spec |    2 -
 2 files changed, 168 insertions(+), 6 deletions(-)
---
diff --git a/eds_2_91_5.patch b/eds_2_91_5.patch
index 6ef7215..3e07dca 100644
--- a/eds_2_91_5.patch
+++ b/eds_2_91_5.patch
@@ -1,6 +1,6 @@
 diff -up evolution-couchdb-0.5.1/addressbook/Makefile.am.eds_2_91_5 evolution-couchdb-0.5.1/addressbook/Makefile.am
---- evolution-couchdb-0.5.1/addressbook/Makefile.am.eds_2_91_5	2011-01-12 19:18:32.554385617 +0100
-+++ evolution-couchdb-0.5.1/addressbook/Makefile.am	2011-01-12 19:18:36.366385787 +0100
+--- evolution-couchdb-0.5.1/addressbook/Makefile.am.eds_2_91_5	2009-08-05 14:04:10.000000000 +0200
++++ evolution-couchdb-0.5.1/addressbook/Makefile.am	2011-01-12 21:29:54.215386001 +0100
 @@ -2,8 +2,8 @@ INCLUDES =						\
  	$(EVOLUTION_CFLAGS)				\
  	-I$(top_srcdir)
@@ -12,9 +12,152 @@ diff -up evolution-couchdb-0.5.1/addressbook/Makefile.am.eds_2_91_5 evolution-co
  
  libebookbackendcouchdb_la_SOURCES =		\
  	e-book-backend-couchdb-factory.c	\
+diff -up evolution-couchdb-0.5.1/addressbook/Makefile.in.eds_2_91_5 evolution-couchdb-0.5.1/addressbook/Makefile.in
+--- evolution-couchdb-0.5.1/addressbook/Makefile.in.eds_2_91_5	2011-01-12 21:30:56.382385991 +0100
++++ evolution-couchdb-0.5.1/addressbook/Makefile.in	2011-01-12 21:33:40.862386009 +0100
+@@ -66,8 +66,8 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__installdirs = "$(DESTDIR)$(extensiondir)"
+-LTLIBRARIES = $(extension_LTLIBRARIES)
++am__installdirs = "$(DESTDIR)$(ebook_backenddir)"
++LTLIBRARIES = $(ebook_backend_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libebookbackendcouchdb_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libebookbackendcouchdb_la_OBJECTS =  \
+@@ -138,7 +138,7 @@ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EDS_API_VERSION = @EDS_API_VERSION@
+-EDS_EXTENSION_DIR = @EDS_EXTENSION_DIR@
++EDS_EBOOK_BACKEND_DIR = @EDS_EBOOK_BACKEND_DIR@
+ EGREP = @EGREP@
+ EPLUGIN_CFLAGS = @EPLUGIN_CFLAGS@
+ EPLUGIN_LIBS = @EPLUGIN_LIBS@
+@@ -262,8 +262,8 @@ INCLUDES = \
+ 	$(EVOLUTION_CFLAGS)				\
+ 	-I$(top_srcdir)
+ 
+-extensiondir = $(EDS_EXTENSION_DIR)
+-extension_LTLIBRARIES = libebookbackendcouchdb.la
++ebook_backenddir = $(EDS_EBOOK_BACKEND_DIR)
++ebook_backend_LTLIBRARIES = libebookbackendcouchdb.la
+ libebookbackendcouchdb_la_SOURCES = \
+ 	e-book-backend-couchdb-factory.c	\
+ 	e-book-backend-couchdb.c		\
+@@ -309,39 +309,39 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+ $(am__aclocal_m4_deps):
+ GNOME_Evolution_CouchDB.server: $(top_builddir)/config.status $(srcdir)/GNOME_Evolution_CouchDB.server.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-install-extensionLTLIBRARIES: $(extension_LTLIBRARIES)
++install-ebook_backendLTLIBRARIES: $(ebook_backend_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)"
+-	@list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \
++	test -z "$(ebook_backenddir)" || $(MKDIR_P) "$(DESTDIR)$(ebook_backenddir)"
++	@list='$(ebook_backend_LTLIBRARIES)'; test -n "$(ebook_backenddir)" || list=; \
+ 	list2=; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    list2="$$list2 $$p"; \
+ 	  else :; fi; \
+ 	done; \
+ 	test -z "$$list2" || { \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \
++	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(ebook_backenddir)'"; \
++	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(ebook_backenddir)"; \
+ 	}
+ 
+-uninstall-extensionLTLIBRARIES:
++uninstall-ebook_backendLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \
++	@list='$(ebook_backend_LTLIBRARIES)'; test -n "$(ebook_backenddir)" || list=; \
+ 	for p in $$list; do \
+ 	  $(am__strip_dir) \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(extensiondir)/$$f'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(extensiondir)/$$f"; \
++	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(ebook_backenddir)/$$f'"; \
++	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(ebook_backenddir)/$$f"; \
+ 	done
+ 
+-clean-extensionLTLIBRARIES:
+-	-test -z "$(extension_LTLIBRARIES)" || rm -f $(extension_LTLIBRARIES)
+-	@list='$(extension_LTLIBRARIES)'; for p in $$list; do \
++clean-ebook_backendLTLIBRARIES:
++	-test -z "$(ebook_backend_LTLIBRARIES)" || rm -f $(ebook_backend_LTLIBRARIES)
++	@list='$(ebook_backend_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ 	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libebookbackendcouchdb.la: $(libebookbackendcouchdb_la_OBJECTS) $(libebookbackendcouchdb_la_DEPENDENCIES) 
+-	$(AM_V_CCLD)$(libebookbackendcouchdb_la_LINK) -rpath $(extensiondir) $(libebookbackendcouchdb_la_OBJECTS) $(libebookbackendcouchdb_la_LIBADD) $(LIBS)
++	$(AM_V_CCLD)$(libebookbackendcouchdb_la_LINK) -rpath $(ebook_backenddir) $(libebookbackendcouchdb_la_OBJECTS) $(libebookbackendcouchdb_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -468,7 +468,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+-	for dir in "$(DESTDIR)$(extensiondir)"; do \
++	for dir in "$(DESTDIR)$(ebook_backenddir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+@@ -498,7 +498,7 @@ maintainer-clean-generic:
+ 	@echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+ 
+-clean-am: clean-extensionLTLIBRARIES clean-generic clean-libtool \
++clean-am: clean-ebook_backendLTLIBRARIES clean-generic clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+@@ -519,7 +519,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-extensionLTLIBRARIES
++install-data-am: install-ebook_backendLTLIBRARIES
+ 
+ install-dvi: install-dvi-am
+ 
+@@ -565,24 +565,24 @@ ps: ps-am
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-extensionLTLIBRARIES
++uninstall-am: uninstall-ebook_backendLTLIBRARIES
+ 
+ .MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+-	clean-extensionLTLIBRARIES clean-generic clean-libtool ctags \
++	clean-ebook_backendLTLIBRARIES clean-generic clean-libtool ctags \
+ 	distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+ 	install-data-am install-dvi install-dvi-am install-exec \
+-	install-exec-am install-extensionLTLIBRARIES install-html \
++	install-exec-am install-ebook_backendLTLIBRARIES install-html \
+ 	install-html-am install-info install-info-am install-man \
+ 	install-pdf install-pdf-am install-ps install-ps-am \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-extensionLTLIBRARIES
++	uninstall-ebook_backendLTLIBRARIES
+ 
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
 diff -up evolution-couchdb-0.5.1/configure.ac.eds_2_91_5 evolution-couchdb-0.5.1/configure.ac
---- evolution-couchdb-0.5.1/configure.ac.eds_2_91_5	2011-01-12 19:14:34.842386088 +0100
-+++ evolution-couchdb-0.5.1/configure.ac	2011-01-12 19:18:01.509385984 +0100
+--- evolution-couchdb-0.5.1/configure.ac.eds_2_91_5	2010-11-24 16:45:50.000000000 +0100
++++ evolution-couchdb-0.5.1/configure.ac	2011-01-12 21:29:54.216386001 +0100
 @@ -46,10 +46,10 @@ AC_SUBST(EPLUGIN_LIBS)
  
  EDS_API_VERSION=1.2
@@ -28,3 +171,24 @@ diff -up evolution-couchdb-0.5.1/configure.ac.eds_2_91_5 evolution-couchdb-0.5.1
  
  PKG_CHECK_EXISTS(evolution-plugin,
  	EVOLUTION_PLUGINS_DIR=`$PKG_CONFIG --variable=plugindir evolution-plugin`,
+diff -up evolution-couchdb-0.5.1/configure.eds_2_91_5 evolution-couchdb-0.5.1/configure
+--- evolution-couchdb-0.5.1/configure.eds_2_91_5	2011-01-12 21:30:21.633386010 +0100
++++ evolution-couchdb-0.5.1/configure	2011-01-12 21:32:03.589386000 +0100
+@@ -748,7 +748,7 @@ am__EXEEXT_TRUE
+ LTLIBOBJS
+ LIBOBJS
+ EVOLUTION_PLUGINS_DIR
+-EDS_EXTENSION_DIR
++EDS_EBOOK_BACKEND_DIR
+ EDS_API_VERSION
+ EPLUGIN_LIBS
+ EPLUGIN_CFLAGS
+@@ -12879,7 +12879,7 @@ if test -n "$PKG_CONFIG" && \
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  EDS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir evolution-data-server-1.2`
++  EDS_EBOOK_BACKEND_DIR=`$PKG_CONFIG --variable=backenddir libedata-book-1.2`
+ else
+   as_fn_error $? "You need evolution-data-server to compile evolution-couchdb" "$LINENO" 5
+ fi
diff --git a/evolution-couchdb.spec b/evolution-couchdb.spec
index 53afc17..27248d1 100644
--- a/evolution-couchdb.spec
+++ b/evolution-couchdb.spec
@@ -9,7 +9,6 @@ URL:           http://www.gnome.org/
 Source0:       ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
 Patch0:        eds_2_91_5.patch
 
-BuildRequires: autoconf
 BuildRequires: couchdb-glib-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: gnome-keyring-devel
@@ -32,7 +31,6 @@ stored in a CouchDB.
 %patch0 -p1 -b .eds_2_91_5
 
 %build
-autoreconf -fi
 %configure --disable-static
 make %{?_smp_mflags} V=1

More information about the scm-commits mailing list