rpms/evolution-connector/FC-4 .cvsignore, 1.14, 1.15 evolution-connector.spec, 1.28, 1.29 regenerate-patch.sh, 1.6, 1.7 sources, 1.14, 1.15 ximian-connector-2.1.4-generated-autotool.patch, 1.5, 1.6

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jun 29 18:59:05 UTC 2005


Author: dmalcolm

Update of /cvs/dist/rpms/evolution-connector/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5365

Modified Files:
	.cvsignore evolution-connector.spec regenerate-patch.sh 
	sources ximian-connector-2.1.4-generated-autotool.patch 
Log Message:
* Wed Jun 29 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.3-1.fc4
- 2.2.3
- Regenerate patch 200 (autotool results) from the source patches




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	3 May 2005 03:03:12 -0000	1.14
+++ .cvsignore	29 Jun 2005 18:59:02 -0000	1.15
@@ -1 +1 @@
-ximian-connector-2.2.2.tar.bz2
+ximian-connector-2.2.3.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-4/evolution-connector.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- evolution-connector.spec	18 May 2005 15:46:56 -0000	1.28
+++ evolution-connector.spec	29 Jun 2005 18:59:02 -0000	1.29
@@ -9,8 +9,8 @@
 %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
 
 Name: evolution-connector
-Version: 2.2.2
-Release: 5
+Version: 2.2.3
+Release: 1.fc4
 License: GPL
 Group: Applications/Productivity
 URL:  http://ftp.gnome.org/pub/gnome/sources/ximian-connector/2.1/
@@ -105,6 +105,10 @@
 %{_datadir}/ximian-connector/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Wed Jun 29 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.3-1.fc4
+- 2.2.3
+- Regenerate patch 200 (autotool results) from the source patches
+
 * Wed May 18 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.2-5
 - add Aaron Gaudio's patch to fix PDA syncronization (#139393)
 


Index: regenerate-patch.sh
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-4/regenerate-patch.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- regenerate-patch.sh	17 May 2005 21:20:48 -0000	1.6
+++ regenerate-patch.sh	29 Jun 2005 18:59:02 -0000	1.7
@@ -1,5 +1,5 @@
 #!/bin/sh
-BASE_NAME=ximian-connector-2.2.2
+BASE_NAME=ximian-connector-2.2.3
 TARBALL_NAME=$BASE_NAME.tar.bz2
 
 INPUT_PATCHES="ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch ximian-connector-2.2.2-noinst-ltlibraries.patch ximian-connector-2.2.2-install-debug-utilities.patch"


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 May 2005 03:03:12 -0000	1.14
+++ sources	29 Jun 2005 18:59:02 -0000	1.15
@@ -1 +1 @@
-2cee47bdf6030d30a5ac82e5028b58ed  ximian-connector-2.2.2.tar.bz2
+9545af11852f8ea3794ca39f58a45873  ximian-connector-2.2.3.tar.bz2

ximian-connector-2.1.4-generated-autotool.patch:
 ximian-connector-2.2.3-patched/Makefile.in                                  |  266 
 ximian-connector-2.2.3-patched/acinclude.m4                                 |   22 
 ximian-connector-2.2.3-patched/aclocal.m4                                   |14969 ++++------
 ximian-connector-2.2.3-patched/addressbook/Makefile.in                      |  189 
 ximian-connector-2.2.3-patched/autom4te.cache                               |only
 ximian-connector-2.2.3-patched/calendar/Makefile.in                         |  193 
 ximian-connector-2.2.3-patched/camel/Makefile.in                            |  255 
 ximian-connector-2.2.3-patched/configure                                    | 2172 -
 ximian-connector-2.2.3-patched/docs/Makefile.in                             |  173 
 ximian-connector-2.2.3-patched/docs/ietf/Makefile.in                        |   81 
 ximian-connector-2.2.3-patched/docs/reference/Makefile.in                   |  109 
 ximian-connector-2.2.3-patched/lib/Makefile.am                              |    6 
 ximian-connector-2.2.3-patched/lib/Makefile.am.orig                         |only
 ximian-connector-2.2.3-patched/lib/Makefile.in                              |  407 
 ximian-connector-2.2.3-patched/mail/Makefile.in                             |  185 
 ximian-connector-2.2.3-patched/shell/Makefile.in                            |  270 
 ximian-connector-2.2.3-patched/storage/Makefile.in                          |  416 
 ximian-connector-2.2.3-patched/xntlm/Makefile.in                            |  181 
 ximian-connector-2.2.3-pristine/Makefile.in.autotool-results                |only
 ximian-connector-2.2.3-pristine/Makefile.in.rej                             |only
 ximian-connector-2.2.3-pristine/acinclude.m4.autotool-results               |only
 ximian-connector-2.2.3-pristine/aclocal.m4.autotool-results                 |only
 ximian-connector-2.2.3-pristine/aclocal.m4.rej                              |only
 ximian-connector-2.2.3-pristine/addressbook/Makefile.in.autotool-results    |only
 ximian-connector-2.2.3-pristine/addressbook/Makefile.in.rej                 |only
 ximian-connector-2.2.3-pristine/calendar/Makefile.in.autotool-results       |only
 ximian-connector-2.2.3-pristine/calendar/Makefile.in.rej                    |only
 ximian-connector-2.2.3-pristine/camel/Makefile.in.autotool-results          |only
 ximian-connector-2.2.3-pristine/camel/Makefile.in.rej                       |only
 ximian-connector-2.2.3-pristine/configure.autotool-results                  |only
 ximian-connector-2.2.3-pristine/configure.rej                               |only
 ximian-connector-2.2.3-pristine/docs/Makefile.in.autotool-results           |only
 ximian-connector-2.2.3-pristine/docs/Makefile.in.rej                        |only
 ximian-connector-2.2.3-pristine/docs/ietf/Makefile.in.autotool-results      |only
 ximian-connector-2.2.3-pristine/docs/ietf/Makefile.in.rej                   |only
 ximian-connector-2.2.3-pristine/docs/reference/Makefile.in.autotool-results |only
 ximian-connector-2.2.3-pristine/docs/reference/Makefile.in.rej              |only
 ximian-connector-2.2.3-pristine/lib/Makefile.am.autotool-results            |only
 ximian-connector-2.2.3-pristine/lib/Makefile.in.autotool-results            |only
 ximian-connector-2.2.3-pristine/lib/Makefile.in.rej                         |only
 ximian-connector-2.2.3-pristine/mail/Makefile.in.autotool-results           |only
 ximian-connector-2.2.3-pristine/mail/Makefile.in.rej                        |only
 ximian-connector-2.2.3-pristine/shell/Makefile.in.autotool-results          |only
 ximian-connector-2.2.3-pristine/shell/Makefile.in.rej                       |only
 ximian-connector-2.2.3-pristine/storage/Makefile.in.autotool-results        |only
 ximian-connector-2.2.3-pristine/storage/Makefile.in.rej                     |only
 ximian-connector-2.2.3-pristine/xntlm/Makefile.in.autotool-results          |only
 ximian-connector-2.2.3-pristine/xntlm/Makefile.in.rej                       |only
 48 files changed, 10035 insertions(+), 9859 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 ximian-connector-2.1.4-generated-autotool.patch
Index: ximian-connector-2.1.4-generated-autotool.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/FC-4/ximian-connector-2.1.4-generated-autotool.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ximian-connector-2.1.4-generated-autotool.patch	17 May 2005 21:20:48 -0000	1.5
+++ ximian-connector-2.1.4-generated-autotool.patch	29 Jun 2005 18:59:02 -0000	1.6
@@ -1,6 +1,6 @@
-diff --recursive -up ximian-connector-2.2.2-pristine/acinclude.m4 ximian-connector-2.2.2-patched/acinclude.m4
---- ximian-connector-2.2.2-pristine/acinclude.m4	2004-08-13 14:16:45.000000000 -0400
-+++ ximian-connector-2.2.2-patched/acinclude.m4	2005-05-17 16:59:29.000000000 -0400
+diff --recursive -up ximian-connector-2.2.3-pristine/acinclude.m4 ximian-connector-2.2.3-patched/acinclude.m4
+--- ximian-connector-2.2.3-pristine/acinclude.m4	2004-08-13 14:16:45.000000000 -0400
++++ ximian-connector-2.2.3-patched/acinclude.m4	2005-06-29 14:56:55.000000000 -0400
 @@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
  	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
  	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
@@ -54,22 +54,22 @@
  					else
  						LDAP_LIBS="-lldap $LDAP_LIBS"
  					fi],
-Only in ximian-connector-2.2.2-pristine: acinclude.m4.autotool-results
-diff --recursive -up ximian-connector-2.2.2-pristine/aclocal.m4 ximian-connector-2.2.2-patched/aclocal.m4
---- ximian-connector-2.2.2-pristine/aclocal.m4	2005-04-06 09:16:16.000000000 -0400
-+++ ximian-connector-2.2.2-patched/aclocal.m4	2005-05-17 16:59:35.000000000 -0400
+Only in ximian-connector-2.2.3-pristine: acinclude.m4.autotool-results
+diff --recursive -up ximian-connector-2.2.3-pristine/aclocal.m4 ximian-connector-2.2.3-patched/aclocal.m4
+--- ximian-connector-2.2.3-pristine/aclocal.m4	2005-06-03 09:49:15.000000000 -0400
++++ ximian-connector-2.2.3-patched/aclocal.m4	2005-06-29 14:57:01.000000000 -0400
 @@ -1,7 +1,7 @@
--# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
 +# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
  
--# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 -# Free Software Foundation, Inc.
 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 +# 2005  Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -11,3703 +11,3760 @@
+@@ -11,4048 +11,3806 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -522,7 +522,7 @@
 -fi
 -AC_CONFIG_COMMANDS_PRE(
 -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
--  AC_MSG_ERROR([conditional \"$1\" was never defined.
+-  AC_MSG_ERROR([conditional "$1" was never defined.
 -Usually this means the macro was only invoked conditionally.])
 -fi])])
 -
@@ -1056,7 +1056,7 @@
 +        [AC_TRY_LINK([
 +#include <libintl.h>
 +],
-+         [return (int) ngettext ("","", 1)],
++         [return !ngettext ("","", 1)],
 +	  gt_cv_func_ngettext_libc=yes,
 +          gt_cv_func_ngettext_libc=no)
 +        ])
@@ -1066,7 +1066,7 @@
 +        	[AC_TRY_LINK([
 +#include <libintl.h>
 +],
-+	          [return (int) dgettext ("","")],
++	          [return !dgettext ("","")],
 +		  gt_cv_func_dgettext_libc=yes,
 +	          gt_cv_func_dgettext_libc=no)
 +        	])
@@ -1803,11 +1803,10 @@
 -    ifelse([$6], , :, [$6])
 -fi
 -])# AC_LIBTOOL_COMPILER_OPTION
-+ll## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
  
-+dnl AC_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-+# serial 1 AC_PROG_INTLTOOL
-+AC_DEFUN([AC_PROG_INTLTOOL],
++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
++# serial 2 IT_PROG_INTLTOOL
++AC_DEFUN([IT_PROG_INTLTOOL],
 +[
  
 -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
@@ -1875,6 +1874,7 @@
 +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 +       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 +      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
 +      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 +      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
 +    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
@@ -1902,6 +1902,7 @@
 +AC_SUBST(INTLTOOL_XAM_RULE)
 +AC_SUBST(INTLTOOL_KBD_RULE)
 +AC_SUBST(INTLTOOL_XML_RULE)
++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
 +AC_SUBST(INTLTOOL_CAVES_RULE)
 +AC_SUBST(INTLTOOL_SCHEMAS_RULE)
 +AC_SUBST(INTLTOOL_THEME_RULE)
@@ -1937,7 +1938,7 @@
 +AC_SUBST(INTLTOOL_MERGE)
 +AC_SUBST(INTLTOOL_UPDATE)
  
--  netbsd* | freebsd* | openbsd* | darwin* )
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
 -    # This has been around since 386BSD, at least.  Likely further.
 -    if test -x /sbin/sysctl; then
 -      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1949,23 +1950,20 @@
 -    # And add a safety zone
 -    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
 -    ;;
-+AC_PATH_PROG(INTLTOOL_PERL, perl)
-+if test -z "$INTLTOOL_PERL"; then
-+   AC_MSG_ERROR([perl not found; required for intltool])
-+fi
-+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-+   AC_MSG_ERROR([perl 5.x required for intltool])
-+fi
-+if test "x$2" != "xno-xml"; then
-+   AC_MSG_CHECKING([for XML::Parser])
-+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-+       AC_MSG_RESULT([ok])
-+   else
-+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-+   fi
-+fi
- 
-- *)
+-  osf*)
+-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+-    # nice to cause kernel panics so lets avoid the loop below.
+-    # First set a reasonable default.
+-    lt_cv_sys_max_cmd_len=16384
+-    # 
+-    if test -x /sbin/sysconfig; then
+-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+-      esac
+-    fi
+-    ;;
+-  *)
 -    # If test is not a shell built-in, we'll probably end up computing a
 -    # maximum length that is only half of the actual maximum length, but
 -    # we can't tell.
@@ -1986,8 +1984,40 @@
 -    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
 -    ;;
 -  esac
+-])
+-if test -n $lt_cv_sys_max_cmd_len ; then
+-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+-else
+-  AC_MSG_RESULT(none)
++AC_PATH_PROG(INTLTOOL_PERL, perl)
++if test -z "$INTLTOOL_PERL"; then
++   AC_MSG_ERROR([perl not found; required for intltool])
++fi
++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
++   AC_MSG_ERROR([perl 5.x required for intltool])
++fi
++if test "x$2" != "xno-xml"; then
++   AC_MSG_CHECKING([for XML::Parser])
++   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++       AC_MSG_RESULT([ok])
++   else
++       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++   fi
+ fi
+-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+ 
++AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
++AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
++AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
++AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
+ 
+-# _LT_AC_CHECK_DLFCN
+-# --------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)dnl
+-])# _LT_AC_CHECK_DLFCN
 +# Remove file type tags (using []) from po/POTFILES.
-+
+ 
 +ifdef([AC_DIVERSION_ICMDS],[
 +  AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
 +      changequote(,)
@@ -2006,31 +2036,6 @@
 +        changequote([,])
 +    ])
 +  ])
- ])
[...27173 lines suppressed...]
 -ETAGS = etags
 -ETAGSFLAGS =
 -
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
 -tags: TAGS
 -
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -297,6 +360,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -358,6 +365,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -27337,54 +24274,34 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -308,8 +372,24 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
+@@ -369,10 +377,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
 -	test -z "$(ETAGS_ARGS)$$tags$$unique" \
 -	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	     $$tags $$unique
+-
 +	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  test -n "$$unique" || unique=$$empty_fix; \
 +	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	    $$tags $$unique; \
 +	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- 	     $$tags $$unique
- 
- GTAGS:
-@@ -318,19 +398,21 @@ GTAGS:
- 	  && gtags -i $(GTAGS_ARGS) $$here
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -395,10 +404,6 @@ GTAGS:
  
  distclean-tags:
--	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 -
 -top_distdir = ..
 -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
--	@list='$(DISTFILES)'; for file in $$list; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -412,7 +417,7 @@ distdir: $(DISTFILES)
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -27393,47 +24310,24 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -348,9 +430,7 @@ distdir: $(DISTFILES)
+@@ -430,7 +435,6 @@ distdir: $(DISTFILES)
  check-am: all-am
  check: check-am
  all-am: Makefile $(LTLIBRARIES)
 -
  installdirs:
--
  install: install-am
  install-exec: install-exec-am
- install-data: install-data-am
-@@ -362,7 +442,7 @@ install-am: all-am
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -370,7 +450,7 @@ mostlyclean-generic:
+@@ -451,7 +455,7 @@ mostlyclean-generic:
  clean-generic:
  
  distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f $(CONFIG_CLEAN_FILES)
 +	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -381,14 +461,17 @@ clean-am: clean-generic clean-libtool cl
- 	mostlyclean-am
- 
- distclean: distclean-am
--
--distclean-am: clean-am distclean-compile distclean-depend \
--	distclean-generic distclean-libtool distclean-tags
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
+@@ -471,6 +475,8 @@ dvi: dvi-am
  
  dvi-am:
  
@@ -27442,51 +24336,24 @@
  info: info-am
  
  info-am:
-@@ -404,7 +487,8 @@ install-man:
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -412,18 +496,26 @@ mostlyclean: mostlyclean-am
- mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- 	mostlyclean-libtool
- 
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
- uninstall-am: uninstall-info-am
- 
--.PHONY: GTAGS all all-am check check-am clean clean-generic \
--	clean-libtool clean-noinstLTLIBRARIES distclean \
--	distclean-compile distclean-depend distclean-generic \
--	distclean-libtool distclean-tags distdir dvi dvi-am info \
--	info-am install install-am install-data install-data-am \
--	install-exec install-exec-am install-info install-info-am \
--	install-man install-strip installcheck installcheck-am \
--	installdirs maintainer-clean maintainer-clean-generic \
--	mostlyclean mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool tags uninstall uninstall-am \
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
+@@ -508,13 +514,14 @@ uninstall-am: uninstall-info-am
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
 +	distclean-tags distdir dvi dvi-am html html-am info info-am \
 +	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	install-exec-am install-info install-info-am install-man \
+ 	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-info-am
 +	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 +	pdf pdf-am ps ps-am tags uninstall uninstall-am \
- 	uninstall-info-am
++	uninstall-info-am
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-Only in ximian-connector-2.2.2-pristine/xntlm: Makefile.in.autotool-results
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Only in ximian-connector-2.2.3-pristine/xntlm: Makefile.in.autotool-results
+Only in ximian-connector-2.2.3-pristine/xntlm: Makefile.in.rej




More information about the fedora-cvs-commits mailing list