Attachment 153256 Details for Bug 225299 – complete patches of Makefile.in to avoir rerunning autoconf

[patch] complete patches of Makefile.in to avoir rerunning autoconf

automake15-spec.diff (text/plain), 7.15 KB, created by Patrice Dumas on 2007-04-22 19:31:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-04-22 19:31:19 UTC

Size: 7.15 KB

patch

obsolete

>? Makefile.in-before-reautomake
>? automake-1.5
>? automake-1.5-built
>? automake-1.5-built2
>? automake-1.5-info.patch-save
>? automake-1.5-new
>? automake-1.5-noautomake_autoconf
>? automake-1.5-noautotools.patch-new
>? automake-1.5-pat
>? automake-1.5-prep
>? automake-1.5-reautoconfed
>? automake-1.5-save
>? automake.out
>? automake15-1.5-20.src.rpm
>? automake15-1.5-22.src.rpm
>? automake15-configure-versioning.patch
>? automake15-new.out
>? automake15-pat.out
>? automake15.out
>? automake15.spec-new
>? automake15.spec-pat
>? automake15.spec-pat2
>? automake_orig
>? configure-pat
>? noarch
>? pat.patch
>? pat2.patch
>Index: automake-1.5-info.patch
>===================================================================
>RCS file: /cvs/dist/rpms/automake15/devel/automake-1.5-info.patch,v
>retrieving revision 1.1
>diff -u -3 -p -r1.1 automake-1.5-info.patch
>--- automake-1.5-info.patch	19 Feb 2007 16:44:48 -0000	1.1
>+++ automake-1.5-info.patch	22 Apr 2007 19:23:26 -0000
>@@ -55,9 +55,9 @@
>  @end example
>  
>  If you add filenames to @samp{ETAGS_ARGS}, you will probably also
>---- automake-1.5/Makefile.in.rh1	2007-02-19 15:53:11.000000000 +0100
>-+++ automake-1.5/Makefile.in	2007-02-19 15:56:51.000000000 +0100
>-@@ -73,15 +73,15 @@
>+--- automake-1.5/Makefile.in.rh1	2007-04-22 18:48:19.000000000 +0200
>++++ automake-1.5/Makefile.in	2007-04-22 18:47:30.000000000 +0200
>+@@ -73,15 +74,15 @@
>  SUBDIRS = . m4 lib tests
>  
>  bin_SCRIPTS = automake aclocal
>@@ -76,19 +76,20 @@
>  
>  EXTRA_DIST = ChangeLog.1996 ChangeLog.1998 ChangeLog.2000
>  
>-@@ -96,9 +96,9 @@
>+@@ -96,9 +97,9 @@
>  
>  DIST_SOURCES =
>  TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
> -INFO_DEPS = automake.info
>-+INFO_DEPS = automake15.info
>- DVIS = automake.dvi
>+-DVIS = automake.dvi
> -TEXINFOS = automake.texi
>++INFO_DEPS = automake15.info
>++DVIS = automake15.dvi
> +TEXINFOS = automake15.texi
>  
>  RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
>  	uninstall-info-recursive all-recursive install-data-recursive \
>-@@ -156,8 +156,8 @@
>+@@ -156,8 +157,8 @@
>  
>  $(srcdir)/version.texi:  $(srcdir)/stamp-vti
>  	@:
>@@ -99,14 +100,30 @@
>  	echo "@set UPDATED $$1 $$2 $$3"; \
>  	echo "@set UPDATED-MONTH $$2 $$3"; \
>  	echo "@set EDITION $(VERSION)"; \
>-@@ -174,8 +174,8 @@
>+@@ -174,8 +175,8 @@
>  maintainer-clean-vti:
>  	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
>  
> -automake.info: automake.texi $(srcdir)/version.texi
> -automake.dvi: automake.texi $(srcdir)/version.texi
> +automake15.info: automake15.texi $(srcdir)/version.texi
>-+automake.dvi: automake15.texi $(srcdir)/version.texi
>++automake15.dvi: automake15.texi $(srcdir)/version.texi
>  
>  .texi.info:
>  	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
>+@@ -230,10 +231,11 @@
>+ 	done
>+ 
>+ mostlyclean-aminfo:
>+-	-rm -f automake.aux automake.cm automake.cp automake.cps automake.cv \
>+-	  automake.dvi automake.fn automake.ky automake.log automake.op \
>+-	  automake.ov automake.pg automake.ps automake.toc automake.tp \
>+-	  automake.tr automake.vr automake.vrs
>++	-rm -f automake15.aux automake15.cm automake15.cp automake15.cps automake15.cv \
>++	  automake15.dvi automake15.fn automake15.ky automake15.log \
>++	  automake15.op automake15.ov automake15.pg automake15.ps \
>++	  automake15.toc automake15.tp automake15.tr automake15.vr \
>++	  automake15.vrs
>+ 
>+ maintainer-clean-aminfo:
>+ 	cd $(srcdir) && \
>Index: automake-1.5-noautotools.patch
>===================================================================
>RCS file: /cvs/dist/rpms/automake15/devel/automake-1.5-noautotools.patch,v
>retrieving revision 1.1
>diff -u -3 -p -r1.1 automake-1.5-noautotools.patch
>--- automake-1.5-noautotools.patch	16 Apr 2007 12:32:32 -0000	1.1
>+++ automake-1.5-noautotools.patch	22 Apr 2007 19:23:26 -0000
>@@ -1,5 +1,5 @@
>---- automake-1.5/lib/Automake/Makefile.in.noautotools	2007-04-16 13:49:31.000000000 +0200
>-+++ automake-1.5/lib/Automake/Makefile.in	2007-04-16 13:52:40.000000000 +0200
>+--- automake-1.5/tests/Makefile.in.noautotools	2007-04-22 20:41:23.000000000 +0200
>++++ automake-1.5/tests/Makefile.in	2007-04-22 20:39:45.000000000 +0200
> @@ -56,6 +56,7 @@
>  PRE_UNINSTALL = :
>  POST_UNINSTALL = :
>@@ -8,8 +8,8 @@
>  AWK = @AWK@
>  DEPDIR = @DEPDIR@
>  EXEEXT = @EXEEXT@
>---- automake-1.5/lib/Makefile.in.noautotools	2007-04-16 13:52:54.000000000 +0200
>-+++ automake-1.5/lib/Makefile.in	2007-04-16 13:53:10.000000000 +0200
>+--- automake-1.5/Makefile.in.noautotools	2007-04-22 20:20:00.000000000 +0200
>++++ automake-1.5/Makefile.in	2007-04-22 20:39:45.000000000 +0200
> @@ -56,6 +56,7 @@
>  PRE_UNINSTALL = :
>  POST_UNINSTALL = :
>@@ -18,8 +18,8 @@
>  AWK = @AWK@
>  DEPDIR = @DEPDIR@
>  EXEEXT = @EXEEXT@
>---- automake-1.5/lib/am/Makefile.in.noautotools	2007-04-16 13:53:23.000000000 +0200
>-+++ automake-1.5/lib/am/Makefile.in	2007-04-16 13:53:42.000000000 +0200
>+--- automake-1.5/lib/Automake/Makefile.in.noautotools	2001-08-23 07:49:55.000000000 +0200
>++++ automake-1.5/lib/Automake/Makefile.in	2007-04-22 20:39:45.000000000 +0200
> @@ -56,6 +56,7 @@
>  PRE_UNINSTALL = :
>  POST_UNINSTALL = :
>@@ -28,8 +28,8 @@
>  AWK = @AWK@
>  DEPDIR = @DEPDIR@
>  EXEEXT = @EXEEXT@
>---- automake-1.5/Makefile.in.noautotools	2007-04-16 13:48:43.000000000 +0200
>-+++ automake-1.5/Makefile.in	2007-04-16 13:49:13.000000000 +0200
>+--- automake-1.5/lib/am/Makefile.in.noautotools	2001-08-23 07:49:55.000000000 +0200
>++++ automake-1.5/lib/am/Makefile.in	2007-04-22 20:39:45.000000000 +0200
> @@ -56,6 +56,7 @@
>  PRE_UNINSTALL = :
>  POST_UNINSTALL = :
>@@ -38,14 +38,24 @@
>  AWK = @AWK@
>  DEPDIR = @DEPDIR@
>  EXEEXT = @EXEEXT@
>---- automake-1.5/configure.noautotools	2007-04-16 13:53:53.000000000 +0200
>-+++ automake-1.5/configure	2007-04-16 13:56:30.000000000 +0200
>+--- automake-1.5/lib/Makefile.in.noautotools	2007-04-22 20:20:00.000000000 +0200
>++++ automake-1.5/lib/Makefile.in	2007-04-22 20:39:45.000000000 +0200
>+@@ -56,6 +56,7 @@
>+ PRE_UNINSTALL = :
>+ POST_UNINSTALL = :
>+ AMTAR = @AMTAR@
>++APIVERSION = @APIVERSION@
>+ AWK = @AWK@
>+ DEPDIR = @DEPDIR@
>+ EXEEXT = @EXEEXT@
>+--- automake-1.5/configure.noautotools	2001-08-23 07:49:52.000000000 +0200
>++++ automake-1.5/configure	2001-08-23 07:49:52.000000000 +0200
> @@ -793,7 +793,7 @@
>  fi
>  
>  # Define the identity of the package.
> -PACKAGE=automake
>-+PACKAGE=automake15
>++PACKAGE=automake-1.5
>  VERSION=1.5
>  cat >> confdefs.h <<EOF
>  #define PACKAGE "$PACKAGE"
>@@ -60,7 +70,7 @@
> +#   are compatible.  So 1.5.1c is compatible with 1.5.
> +# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
> +#   aren't the same.
>-+APIVERSION=`echo "$VERSION" | sed -e 's/^$[[0-9]]*\.[[0-9]]*[[a-z]]?$.*$/\1/'`
>++APIVERSION=`echo "$VERSION" | sed -e 's/^$[0-9]*\.[0-9]*[a-z]?$.*$/\1/'`
> +
>  
>  ACLOCAL="`pwd`/aclocal --acdir=m4"
>Index: automake15.spec
>===================================================================
>RCS file: /cvs/dist/rpms/automake15/devel/automake15.spec,v
>retrieving revision 1.20
>diff -u -3 -p -r1.20 automake15.spec
>--- automake15.spec	16 Apr 2007 12:32:32 -0000	1.20
>+++ automake15.spec	22 Apr 2007 19:23:26 -0000
>@@ -61,7 +61,7 @@ rm -f automake.info*
> touch -r configure.noautotools configure
> touch -r configure.in.orig configure.in
> # patch 2 touches configure.in
>-autoconf
>+#autoconf
> ./configure --program-suffix=-%{version} --prefix=%{_prefix} \
>    --mandir=%{_mandir} --infodir=%{_infodir} --bindir=%{_bindir} \
>    --datadir=%{_datadir}

Actions: View | Diff

Attachments on bug 225299: 150101 | 153256