RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 18-Dec-2008 19:59:15
Branch: HEAD Handle: 2008121818591500
Modified files:
rpm/build parsePrep.c
Log:
- jbj: change to positive #ifdef vendor logic, #ifndef is too
goosey-loosey.
Summary:
Revision Changes Path
2.129 +5 -3 rpm/build/parsePrep.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/build/parsePrep.c
============================================================================
$ cvs diff -u -r2.128 -r2.129 parsePrep.c
--- rpm/build/parsePrep.c 18 Dec 2008 17:11:34 -0000 2.128
+++ rpm/build/parsePrep.c 18 Dec 2008 18:59:15 -0000 2.129
@@ -283,11 +283,13 @@
if (strcmp(tar, "%{__tar}") == 0)
tar = xstrdup("tar");
-#if !defined(RPM_VENDOR_ARK) /* use-gnu-tar-compression-detection */
- if (compressed != COMPRESSED_NOT) {
+#if defined(RPM_VENDOR_ARK) /* use-gnu-tar-compression-detection */
+/* We leave compression handling for all tar based files up to GNU tar */
+ if (compressed == COMPRESSED_ZIP)
#else
- if (compressed == COMPRESSED_ZIP) { /* We leave compression handling for
all tar based files up to GNU tar */
+ if (compressed != COMPRESSED_NOT)
#endif
+ {
const char *zipper;
int needtar = 1;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
