RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 26-Jan-2008 05:12:44
Branch: HEAD Handle: 2008012604124301
Modified files:
rpm CHANGES
rpm/build files.c
Log:
- jbj: re-add PayloadFilesHavePrefix/CompressedFileNames w --lsb.
Summary:
Revision Changes Path
1.2098 +1 -0 rpm/CHANGES
1.313 +5 -0 rpm/build/files.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2097 -r1.2098 CHANGES
--- rpm/CHANGES 25 Jan 2008 22:19:12 -0000 1.2097
+++ rpm/CHANGES 26 Jan 2008 04:12:43 -0000 1.2098
@@ -1,4 +1,5 @@
5.0.0 -> 5.1a1:
+ - jbj: re-add PayloadFilesHavePrefix/CompressedFileNames w --lsb.
- rse: provide %{shrink:<body>} macro for removing leading+trailing and removing intermediate whitespaces
- rse: allow sub-shell and Lua independent speedy lookup of environment variables via %{getenv:<name>} in macros
- jbj: QNX needs defines for fts.c.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.312 -r1.313 files.c
--- rpm/build/files.c 18 Jan 2008 23:04:05 -0000 1.312
+++ rpm/build/files.c 26 Jan 2008 04:12:44 -0000 1.313
@@ -1608,6 +1608,11 @@
he->append = 1;
xx = headerPut(h, he, 0);
he->append = 0;
+
+if (_rpmbuildFlags & 4) {
+(void) rpmlibNeedsFeature(h, "PayloadFilesHavePrefix", "4.0-1");
+(void) rpmlibNeedsFeature(h, "CompressedFileNames", "3.0.4-1");
+}
compressFilelist(h);
@@ .
Received on Sat Jan 26 05:12:44 2008