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: 07-Jun-2011 18:33:25
Branch: rpm-5_4 Handle: 2011060716332401
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/build parseChangelog.c
Log:
fix implicit %clean not being run when %changelog is present.
Summary:
Revision Changes Path
1.3501.2.138+2 -0 rpm/CHANGES
2.50.6.1 +8 -0 rpm/build/parseChangelog.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.137 -r1.3501.2.138 CHANGES
--- rpm/CHANGES 7 Jun 2011 15:37:38 -0000 1.3501.2.137
+++ rpm/CHANGES 7 Jun 2011 16:33:24 -0000 1.3501.2.138
@@ -1,4 +1,6 @@
5.4.1 -> 5.4.2
+ - proyvind: mandriva: fix implicit %clean not being run when %changelog
is
+ present.
- proyvind: don't pick up python version from python egg, rely on path
only in stead to avoid incorrect version dependencies if any other
egg metadata for other versions is found.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parseChangelog.c
============================================================================
$ cvs diff -u -r2.50 -r2.50.6.1 parseChangelog.c
--- rpm/build/parseChangelog.c 18 Jan 2009 17:19:58 -0000 2.50
+++ rpm/build/parseChangelog.c 7 Jun 2011 16:33:25 -0000 2.50.6.1
@@ -269,7 +269,11 @@
/* 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;
@@ -281,7 +285,11 @@
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)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
