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-Mar-2011 18:46:07
Branch: rpm-5_3 Handle: 2011032517460700
Modified files: (Branch: rpm-5_3)
rpm/build parseFiles.c
Log:
fix duplicate %clean section and move under mandriva #ifdef for now
Summary:
Revision Changes Path
2.36.4.2 +5 -1 rpm/build/parseFiles.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/build/parseFiles.c
============================================================================
$ cvs diff -u -r2.36.4.1 -r2.36.4.2 parseFiles.c
--- rpm/build/parseFiles.c 23 Mar 2011 20:51:30 -0000 2.36.4.1
+++ rpm/build/parseFiles.c 25 Mar 2011 17:46:07 -0000 2.36.4.2
@@ -114,8 +114,12 @@
}
}
+#if defined(RPM_VENDOR_MANDRIVA)
/* if no %clean section, add implicit */
- rc = (nextPart == PART_NONE) ? PART_CLEAN : nextPart;
+ 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-cvs@rpm5.org
