RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Apr-2008 22:52:52
Branch: HEAD Handle: 2008040220525101
Modified files:
rpm CHANGES VENDOR
rpm/build files.c
Log:
- jbj: merge "support-srcdefattr" patch from OpenPKG.
Summary:
Revision Changes Path
1.2278 +1 -0 rpm/CHANGES
2.42 +0 -5 rpm/VENDOR
1.320 +0 -6 rpm/build/files.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2277 -r1.2278 CHANGES
--- rpm/CHANGES 2 Apr 2008 20:34:17 -0000 1.2277
+++ rpm/CHANGES 2 Apr 2008 20:52:51 -0000 1.2278
@@ -1,4 +1,5 @@
5.0.0 -> 5.1a1:
+ - jbj: merge "support-srcdefattr" patch from OpenPKG.
- jbj: fix: RPMTAG_NVRA w .src/.pubkey in error msg is bogus.
- jbj: permit noarch sub-packages. Pattern match guaranteee next ...
- rpm.org: Enhance error message on failed ts lock acquire (rhbz#427064).
@@ .
patch -p0 <<'@@ .'
Index: rpm/VENDOR
============================================================================
$ cvs diff -u -r2.41 -r2.42 VENDOR
--- rpm/VENDOR 2 Apr 2008 19:22:58 -0000 2.41
+++ rpm/VENDOR 2 Apr 2008 20:52:51 -0000 2.42
@@ -115,11 +115,6 @@
%files section only. No magic in the code wished.
________________________________________________________________________
- Change: support-srcdefattr
- Purpose: allow to set SRPM file attributes via %{_srcdefattr}
macro
- Reason: This makes the generated SRPMs look more uniform
- ________________________________________________________________________
-
Change: still-support-section-clean
Purpose: allow us to still use %clean section
Reason: for temporary backward compatibility only
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.319 -r1.320 files.c
--- rpm/build/files.c 2 Apr 2008 18:35:26 -0000 1.319
+++ rpm/build/files.c 2 Apr 2008 20:52:52 -0000 1.320
@@ -2678,27 +2678,21 @@
struct FileList_s fl;
char **files, **fp;
int rc;
-#if defined(RPM_VENDOR_OPENPKG) /* support-srcdefattr */
/* srcdefattr: needed variables */
char _srcdefattr_buf[BUFSIZ];
char *_srcdefattr;
-#endif
-#if defined(RPM_VENDOR_OPENPKG) /* support-srcdefattr */
_srcdefattr = rpmExpand("%{?_srcdefattr}", NULL);
-#endif
*sfp = newStringBuf();
x = initSourceHeader(spec, sfp);
-#if defined(RPM_VENDOR_OPENPKG) /* support-srcdefattr */
/* srcdefattr: initialize file list structure */
memset(&fl, 0, sizeof(fl));
if (_srcdefattr && *_srcdefattr) {
snprintf(_srcdefattr_buf, sizeof(_srcdefattr_buf), "%%defattr %s",
_srcdefattr);
parseForAttr(_srcdefattr_buf, &fl);
}
-#endif
/* Construct the SRPM file list. */
fl.fileList = xcalloc((spec->numSources + 1), sizeof(*fl.fileList));
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
