Again we're working at cross purposes:
%clean was removed as part of spec file syntax in 2007.
And #ifdef RPM_VENDOR_MANDRIVA is going to be phased out …
*shrug*
73 de Jeff
On Aug 25, 2011, at 2:35 PM, Per Øyvind Karlsen wrote:
> RPM Package Manager, CVS Repository
> http://rpm5.org/cvs/
> ____________________________________________________________________________
>
> Server: rpm5.org Name: Per Øyvind Karlsen
> Root: /v/rpm/cvs Email: pkarl...@rpm5.org
> Module: rpm Date: 25-Aug-2011 20:35:20
> Branch: rpm-5_3 Handle: 2011082518351901
>
> Modified files: (Branch: rpm-5_3)
> rpm CHANGES
> rpm/build parseChangelog.c parseFiles.c
>
> Log:
> really always invoke %clean at end.
>
> Summary:
> Revision Changes Path
> 1.3296.2.249+1 -0 rpm/CHANGES
> 2.50.4.2 +0 -8 rpm/build/parseChangelog.c
> 2.36.4.3 +0 -5 rpm/build/parseFiles.c
> ____________________________________________________________________________
>
> patch -p0 <<'@@ .'
> Index: rpm/CHANGES
> ============================================================================
> $ cvs diff -u -r1.3296.2.248 -r1.3296.2.249 CHANGES
> --- rpm/CHANGES 29 Jul 2011 04:27:49 -0000 1.3296.2.248
> +++ rpm/CHANGES 25 Aug 2011 18:35:19 -0000 1.3296.2.249
> @@ -1,4 +1,5 @@
> 5.3.12 -> 5.3.13
> + - proyvind: really always invoke %clean at end
> - proyvind: add sparc64v2 arch to %sparcx.
> - proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
> all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
> @@ .
> patch -p0 <<'@@ .'
> Index: rpm/build/parseChangelog.c
> ============================================================================
> $ cvs diff -u -r2.50.4.1 -r2.50.4.2 parseChangelog.c
> --- rpm/build/parseChangelog.c 7 Jun 2011 16:34:10 -0000 2.50.4.1
> +++ rpm/build/parseChangelog.c 25 Aug 2011 18:35:20 -0000 2.50.4.2
> @@ -269,11 +269,7 @@
> /* There are no options to %changelog */
> if ((rc = readLine(spec, STRIP_COMMENTS)) > 0) {
> iob = rpmiobFree(iob);
> -#if defined(RPM_VENDOR_MANDRIVA)
> - return (spec->clean == NULL) ? PART_CLEAN : PART_NONE;
> -#else
> return PART_NONE;
> -#endif
> }
> if (rc != RPMRC_OK)
> return rc;
> @@ -285,11 +281,7 @@
> iob = rpmiobAppend(iob, spec->line, 0);
> line = _free(line);
> if ((rc = readLine(spec, STRIP_COMMENTS | STRIP_NOEXPAND)) > 0) {
> -#if defined(RPM_VENDOR_MANDRIVA)
> - nextPart = (spec->clean == NULL) ? PART_CLEAN : PART_NONE;
> -#else
> nextPart = PART_NONE;
> -#endif
> break;
> }
> if (rc != RPMRC_OK)
> @@ .
> patch -p0 <<'@@ .'
> Index: rpm/build/parseFiles.c
> ============================================================================
> $ cvs diff -u -r2.36.4.2 -r2.36.4.3 parseFiles.c
> --- rpm/build/parseFiles.c 25 Mar 2011 17:46:07 -0000 2.36.4.2
> +++ rpm/build/parseFiles.c 25 Aug 2011 18:35:20 -0000 2.36.4.3
> @@ -114,12 +114,7 @@
> }
> }
>
> -#if defined(RPM_VENDOR_MANDRIVA)
> - /* if no %clean section, add implicit */
> - rc = (nextPart == PART_NONE && spec->clean == NULL) ? PART_CLEAN :
> nextPart;
> -#else
> rc = nextPart;
> -#endif
>
> exit:
> argv = _free(argv);
> @@ .
> ______________________________________________________________________
> RPM Package Manager http://rpm5.org
> CVS Sources Repository rpm-...@rpm5.org
______________________________________________________________________
RPM Package Manager http://rpm5.org
Developer Communication List rpm-devel@rpm5.org
