OpenPKG Specs: comparison openpkg/rpm.patch.feature

-:f946d51b208b
+:058eda99fa36
 | run-time tests).
 +---------------------------------------------------------------------------
 Index: build/build.c
 --- build/build.c	4 Mar 2003 15:27:33 -0000	1.1.1.20
 +++ build/build.c	6 Feb 2004 15:37:57 -0000	1.4
-@@ -113,6 +129,14 @@
+@@ -129,6 +129,14 @@
 	mTemplate = "%{__spec_clean_template}";
 	mPost = "%{__spec_clean_post}";
 	break;
 +#ifdef OPENPKG
 +    case RPMBUILD_TRACK:
 +	break;
 +#endif
 case RPMBUILD_STRINGBUF:
 default:
 	mTemplate = "%{___build_template}";
-@@ -169,7 +193,11 @@
+@@ -185,7 +193,11 @@
 (void) fputs(buildTemplate, fp);
 +#ifdef OPENPKG
 +    if (what != RPMBUILD_PREP && what != RPMBUILD_RMBUILD && spec->buildSubdir && what != RPMBUILD_TRACK)
 if (what != RPMBUILD_PREP && what != RPMBUILD_RMBUILD && spec->buildSubdir)
 +#endif
 	fprintf(fp, "cd %s\n", spec->buildSubdir);
 if (what == RPMBUILD_RMBUILD) {
-@@ -215,6 +243,9 @@
+@@ -231,6 +243,9 @@
 buildCmd = rpmExpand("%{___build_cmd}", " ", buildScript, NULL);
 (void) poptParseArgvString(buildCmd, &argc, &argv);
 +#ifdef OPENPKG
 +    if (what != RPMBUILD_TRACK)
 +#endif
 rpmMessage(RPMMESS_NORMAL, _("Executing(%s): %s\n"), name, buildCmd);
 if (!(child = fork())) {
-@@ -290,6 +323,12 @@
+@@ -306,6 +323,12 @@
 /*@=boundsread@*/
 	}
 } else {
 +#ifdef OPENPKG
 +	if ((what & RPMBUILD_TRACK) &&
 | we would just have temporary files staying around forever.
 +---------------------------------------------------------------------------
 Index: build/build.c
 --- build/build.c	4 Mar 2003 15:27:33 -0000	1.1.1.20
 +++ build/build.c	6 Feb 2004 15:37:57 -0000	1.4
-@@ -242,7 +273,9 @@
+@@ -273,7 +273,9 @@
 exit:
 if (scriptName) {
 +#ifndef OPENPKG
 	if (!rc)
 | removal failures (if they are still not empty).
 +---------------------------------------------------------------------------
 Index: build/build.c
 --- build/build.c	4 Mar 2003 15:27:33 -0000	1.1.1.20
 +++ build/build.c	6 Feb 2004 15:37:57 -0000	1.4
-@@ -338,6 +377,21 @@
+@@ -377,6 +377,21 @@
 if (what & RPMBUILD_RMSPEC)
 	(void) Unlink(spec->specFile);
 +#ifdef OPENPKG
 +    if (what & RPMBUILD_RMSOURCE) {
 | .src.rpm files.
 +---------------------------------------------------------------------------
 Index: build/files.c
 --- build/files.c	4 Mar 2003 17:04:13 -0000	1.1.1.20
 +++ build/files.c	6 Feb 2004 15:37:57 -0000	1.3
-@@ -2183,6 +2185,12 @@
+@@ -2185,6 +2185,12 @@
 	case RPMTAG_CHANGELOGTEXT:
 	case RPMTAG_URL:
 	case HEADER_I18NTABLE:
 +#ifdef OPENPKG
 +	case RPMTAG_PROVIDENAME:
 | up there, too.
 +---------------------------------------------------------------------------
 Index: build/files.c
 --- build/files.c	4 Mar 2003 17:04:13 -0000	1.1.1.20
 +++ build/files.c	6 Feb 2004 15:37:57 -0000	1.3
-@@ -2253,8 +2261,20 @@
+@@ -2261,8 +2261,20 @@
 	}
 {	const char * sfn;
 +#ifndef OPENPKG
 	sfn = rpmGetPath( ((srcPtr->flags & RPMBUILD_ISNO) ? "!" : ""),
 +        sfn2 = _free(sfn2);
 +#endif
 	appendLineStringBuf(sourceFiles, sfn);
 	sfn = _free(sfn);
 }
-@@ -2263,8 +2283,20 @@
+@@ -2271,8 +2283,20 @@
 for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
 	for (srcPtr = pkg->icon; srcPtr != NULL; srcPtr = srcPtr->next) {
 	    const char * sfn;
 +#ifndef OPENPKG
 	    sfn = rpmGetPath( ((srcPtr->flags & RPMBUILD_ISNO) ? "!" : ""),
 | up there, too.
 +---------------------------------------------------------------------------
 Index: build/parsePrep.c
 --- build/parsePrep.c	7 Aug 2002 14:20:45 -0000	1.1.1.10
 +++ build/parsePrep.c	6 Jun 2005 15:53:04 -0000	1.4
-@@ -87,7 +88,15 @@
+@@ -88,7 +88,15 @@
 	return NULL;
 }
 +#ifndef OPENPKG
 urlfn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
 +    }
 +#endif
 args[0] = '\0';
 if (db) {
-@@ -182,7 +201,15 @@
+@@ -193,7 +201,15 @@
 	return NULL;
 }
 +#ifndef OPENPKG
 urlfn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
 | we build against an external one.
 +---------------------------------------------------------------------------
 Index: configure.ac
 --- configure.ac	2 Jul 2003 19:20:52 -0000	1.1.1.4
 +++ configure.ac	13 Sep 2006 13:39:09 -0000
-@@ -310,7 +311,7 @@
+@@ -311,7 +311,7 @@
 WITH_ZLIB_SUBDIR=
 WITH_ZLIB_INCLUDE=
 WITH_ZLIB_LIB=
 -if test -d zlib ; then
 +if false; then
 | would make RPM pick up things which we do not want to be picked up.
 +---------------------------------------------------------------------------
 Index: configure.ac
 --- configure.ac	2 Jul 2003 19:20:52 -0000	1.1.1.4
 +++ configure.ac	13 Sep 2006 13:39:11 -0000
-@@ -324,38 +325,38 @@
+@@ -325,38 +325,38 @@
 localdone=
 -dirs=$prefix
 -if test "$cross_compiling" != "yes"; then
 | Adjust paths for OpenPKG filesystem layout.
 +---------------------------------------------------------------------------
 Index: configure.ac
 --- configure.ac	2 Jul 2003 19:20:52 -0000	1.1.1.4
 +++ configure.ac	13 Sep 2006 13:39:12 -0000
-@@ -1200,12 +1201,12 @@
+@@ -1201,12 +1201,12 @@
 AC_SUBST(LOCALEDIR)
 LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
 AC_SUBST(LIBDIR)
 -RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
 +RPMCONFIGDIR="@l_prefix@/lib/openpkg"
 -SYSCONFIGDIR="`echo /etc/rpm`"
 +SYSCONFIGDIR="@l_prefix@/etc/openpkg"
 AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR",
 	[Full path to rpm system configuration directory (usually /etc/rpm)])
 AC_SUBST(SYSCONFIGDIR)
-@@ -1215,17 +1216,17 @@
+@@ -1216,17 +1216,17 @@
 	[Colon separated paths of macro files to read.])
 AC_SUBST(MACROFILES)
 -LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc"
 +LIBRPMRC_FILENAME="${SYSCONFIGDIR}/rpmrc"
 | "unzip" out of the bootstrap package.
 +---------------------------------------------------------------------------
 Index: rpmio/macro.c
 --- rpmio/macro.c	15 May 2003 13:42:01 -0000	1.1.1.7
 +++ rpmio/macro.c	22 Jan 2004 21:42:32 -0000	1.2
-@@ -1116,9 +1119,11 @@
+@@ -1119,9 +1119,11 @@
 	case 2:	/* COMPRESSED_BZIP2 */
 	    sprintf(be, "%%_bzip2 %s", b);
 	    break;
 +#if 0
 	case 3:	/* COMPRESSED_ZIP */
 	    break;
 +#endif
 	}
 	b = be;
 } else if (STREQ("S", f, fn)) {
-@@ -1720,9 +1725,11 @@
+@@ -1723,9 +1725,11 @@
 if ((magic[0] == 'B') && (magic[1] == 'Z')) {
 	*compressed = COMPRESSED_BZIP2;
 +#if 0
 } else if ((magic[0] == 0120) && (magic[1] == 0113) &&
 | processing. Else it would be nothing more than a %{warn:<msg>}.
 +---------------------------------------------------------------------------
 Index: rpmio/macro.c
 --- rpmio/macro.c	15 May 2003 13:42:01 -0000	1.1.1.7
 +++ rpmio/macro.c	22 Jan 2004 21:42:32 -0000	1.2
-@@ -1332,7 +1337,7 @@
+@@ -1337,7 +1337,7 @@
 	    STREQ("error", f, fn)) {
 		int waserror = 0;
 		if (STREQ("error", f, fn))
 -			waserror = 1;
 +			waserror = 1, rc = 1;
 | run-time tests).
 +---------------------------------------------------------------------------
 Index: rpmqv.c
 --- rpmqv.c	4 Mar 2003 15:32:57 -0000	1.1.1.8
 +++ rpmqv.c	6 Feb 2004 15:37:56 -0000	1.4
-@@ -703,7 +707,19 @@
+@@ -707,7 +707,19 @@
 	    /*@innerbreak@*/ break;
 	case 's':
 	    ba->buildAmount |= RPMBUILD_PACKAGESOURCE;
 +	    /* enforce no dependency checking */
 +	    ba->noDeps = 1;
 +	break;
 +#endif
 }
 /*@=branchstate@*/
-@@ -303,6 +312,11 @@
+@@ -304,6 +313,11 @@
 	      case PART_VERIFYSCRIPT:
 		pkg->verifyFile = xstrdup(file);
 		break;
 +#ifdef OPENPKG
 +	      case PART_TEST:
 +    p->testFile = NULL;
 +#endif
 p->specialDoc = NULL;
-@@ -444,6 +455,9 @@
+@@ -452,6 +463,9 @@
 spec->install = NULL;
 spec->check = NULL;
 spec->clean = NULL;
 +#ifdef OPENPKG
 +    spec->track = NULL;
 +#endif
 spec->sources = NULL;
 spec->packages = NULL;
-@@ -491,6 +505,9 @@
+@@ -499,6 +513,9 @@
 spec->install = freeStringBuf(spec->install);
 spec->check = freeStringBuf(spec->check);
 spec->clean = freeStringBuf(spec->clean);
 +#ifdef OPENPKG
 +    spec->track = freeStringBuf(spec->track);
 { RPMTAG_DISTRIBUTION,	"%{distribution}" },
 +    { RPMTAG_CLASS,		"%{class}" },
 { RPMTAG_DISTURL,		"%{disturl}" },
 { -1, NULL }
 };
-@@ -537,6 +547,7 @@
+@@ -545,6 +547,7 @@
 	(void) stashSt(spec, pkg->header, tag, lang);
 	/*@fallthrough@*/
 case RPMTAG_DISTRIBUTION:
 +    case RPMTAG_CLASS:
 case RPMTAG_VENDOR:
 case RPMTAG_LICENSE:
 case RPMTAG_PACKAGER:
-@@ -743,6 +754,7 @@
+@@ -751,6 +754,7 @@
 {RPMTAG_LICENSE,		0, 0, "copyright"},
 {RPMTAG_LICENSE,		0, 0, "license"},
 {RPMTAG_DISTRIBUTION,	0, 0, "distribution"},
 +    {RPMTAG_CLASS,		0, 0, "class"},
 {RPMTAG_DISTURL,		0, 0, "disturl"},

OpenPKG Specs / file comparison

comparison: openpkg/rpm.patch.feature

openpkg/rpm.patch.feature