From 1f9c136553dadc9eae56f6d9e9958eb5036cc2ed Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 9 Mar 1999 18:47:08 +0000 Subject: [PATCH] Ratchet forward to rpm-2.5.7. CVS patchset: 2868 CVS date: 1999/03/09 18:47:08 --- tests/hello-test/ba.exp | 2 +- tests/hello-test/ckH.exp | 36 ++++++++++++++++++------------------ tests/hello-test/ckS.exp | 6 +++--- tests/hello-test/e.exp | 8 ++++---- tests/hello-test/i.exp | 12 +++++++----- tests/hello-test/qi.exp | 10 +++++----- 6 files changed, 38 insertions(+), 36 deletions(-) diff --git a/tests/hello-test/ba.exp b/tests/hello-test/ba.exp index 0c70491..88c428a 100644 --- a/tests/hello-test/ba.exp +++ b/tests/hello-test/ba.exp @@ -3,7 +3,7 @@ Executing: %prep + cd /usr/src/redhat/BUILD + cd /usr/src/redhat/BUILD + rm -rf hello-1.0 -+ /bin/gzip -dc /usr/src/redhat/SOURCES/hello-1.0.tar.gz ++ /bin/gzip -d + tar -xf - + STATUS=0 + [ 0 -ne 0 ] diff --git a/tests/hello-test/ckH.exp b/tests/hello-test/ckH.exp index a91c6c1..3c9f4d9 100644 --- a/tests/hello-test/ckH.exp +++ b/tests/hello-test/ckH.exp @@ -16,11 +16,11 @@ Entry : 005 (1004)RPMTAG_SUMMARY I18N_STRING_TYPE 0xffffffff 00000001 Entry : 006 (1005)RPMTAG_DESCRIPTION I18N_STRING_TYPE 0xffffffff 00000001 Data: 000 Simple rpm demonstration. Entry : 007 (1006)RPMTAG_BUILDTIME INT32_TYPE 0xffffffff 00000001 - Data: 000 0x36545684 (911496836) + Data: 000 0x36e56b91 (921004945) Entry : 008 (1007)RPMTAG_BUILDHOST STRING_TYPE 0xffffffff 00000001 - Data: 000 krusty.devel.redhat.com + Data: 000 sparc9.test.redhat.com Entry : 009 (1009)RPMTAG_SIZE INT32_TYPE 0xffffffff 00000001 - Data: 000 0x000099a8 (39336) + Data: 000 0x00007c67 (31847) Entry : 010 (1010)RPMTAG_DISTRIBUTION STRING_TYPE 0xffffffff 00000001 Data: 000 RPM test suite. Entry : 011 (1011)RPMTAG_VENDOR STRING_TYPE 0xffffffff 00000001 @@ -44,23 +44,23 @@ Entry : 018 (1027)RPMTAG_FILENAMES STRING_ARRAY_TYPE 0xffffffff 00000003 Entry : 019 (1028)RPMTAG_FILESIZES INT32_TYPE 0xffffffff 00000003 Data: 000 0x00000400 (1024) Data: 001 0x00000024 (36) - Data: 002 0x00009584 (38276) + Data: 002 0x00007843 (30787) Entry : 020 (1030)RPMTAG_FILEMODES INT16_TYPE 0xffffffff 00000003 Data: 000 0x41ed (16877) - Data: 001 0xffff81a4 (-32348) - Data: 002 0xffff81e9 (-32279) + Data: 001 0x81a4 (-32348) + Data: 002 0x81e9 (-32279) Entry : 021 (1033)RPMTAG_FILERDEVS INT16_TYPE 0xffffffff 00000003 Data: 000 0x0000 (0) Data: 001 0x0000 (0) Data: 002 0x0000 (0) Entry : 022 (1034)RPMTAG_FILEMTIMES INT32_TYPE 0xffffffff 00000003 - Data: 000 0x3654567f (911496831) + Data: 000 0x36e56b8b (921004939) Data: 001 0x362ca336 (908895030) - Data: 002 0x3654567f (911496831) + Data: 002 0x36e56b8a (921004938) Entry : 023 (1035)RPMTAG_FILEMD5S STRING_ARRAY_TYPE 0xffffffff 00000003 Data: 000 Data: 001 33cccc1f055d73acaceed7d8204e99c7 - Data: 002 dbf1372435b9a3d68d4f650b687f2081 + Data: 002 741e702cdf114c95a9e965fa8aa40864 Entry : 024 (1036)RPMTAG_FILELINKTOS STRING_ARRAY_TYPE 0xffffffff 00000003 Data: 000 Data: 001 @@ -84,7 +84,7 @@ Entry : 029 (1045)RPMTAG_FILEVERIFYFLAGS INT32_TYPE 0xffffffff 0000 Data: 001 0x00000000 (0) Data: 002 0xffffffff (-1) Entry : 030 (1046)RPMTAG_ARCHIVESIZE INT32_TYPE 0xffffffff 00000001 - Data: 000 0x000097ec (38892) + Data: 000 0x00007a6c (31340) Entry : 031 (1047)RPMTAG_PROVIDES STRING_ARRAY_TYPE 0xffffffff 00000001 Data: 000 hi Entry : 032 (1048)RPMTAG_REQUIREFLAGS INT32_TYPE 0xffffffff 00000003 @@ -106,7 +106,7 @@ Entry : 036 (1054)RPMTAG_CONFLICTNAME STRING_ARRAY_TYPE 0xffffffff 0000000 Entry : 037 (1055)RPMTAG_CONFLICTVERSION STRING_ARRAY_TYPE 0xffffffff 00000001 Data: 000 Entry : 038 (1064)RPMTAG_RPMVERSION STRING_TYPE 0xffffffff 00000001 - Data: 000 2.5.6 + Data: 000 2.5.7 Entry : 039 (1080)RPMTAG_CHANGELOGTIME INT32_TYPE 0xffffffff 00000001 Data: 000 0x362cf9d0 (908917200) Entry : 040 (1081)RPMTAG_CHANGELOGNAME STRING_ARRAY_TYPE 0xffffffff 00000001 @@ -124,15 +124,15 @@ Entry : 045 (1088)RPMTAG_POSTUNPROG STRING_TYPE 0xffffffff 00000001 Entry : 046 (1090)RPMTAG_OBSOLETES STRING_ARRAY_TYPE 0xffffffff 00000001 Data: 000 howdy Entry : 047 (1094)RPMTAG_COOKIE STRING_TYPE 0xffffffff 00000001 - Data: 000 krusty.devel.redhat.com 911496836 + Data: 000 sparc9.test.redhat.com 921004945 Entry : 048 (1095)RPMTAG_FILEDEVICES INT32_TYPE 0xffffffff 00000003 - Data: 000 0x00000804 (2052) - Data: 001 0x00000804 (2052) - Data: 002 0x00000804 (2052) + Data: 000 0x00000801 (2049) + Data: 001 0x00000801 (2049) + Data: 002 0x00000801 (2049) Entry : 049 (1096)RPMTAG_FILEINODES INT32_TYPE 0xffffffff 00000003 - Data: 000 0x0001b49e (111774) - Data: 001 0x0001b49f (111775) - Data: 002 0x0001a4e3 (107747) + Data: 000 0x000410ab (266411) + Data: 001 0x000410ac (266412) + Data: 002 0x0004807b (295035) Entry : 050 (1097)RPMTAG_FILELANGS STRING_ARRAY_TYPE 0xffffffff 00000003 Data: 000 Data: 001 diff --git a/tests/hello-test/ckS.exp b/tests/hello-test/ckS.exp index f55a054..5549aee 100644 --- a/tests/hello-test/ckS.exp +++ b/tests/hello-test/ckS.exp @@ -2,7 +2,7 @@ Entry count: 2 CT TAG TYPE OFSET COUNT Entry : 000 (1000)RPMTAG_NAME INT32_TYPE 0xffffffff 00000001 - Data: 000 0x000041c3 (16835) + Data: 000 0x000033ec (13292) Entry : 001 (1004)RPMTAG_SUMMARY BIN_TYPE 0xffffffff 00000016 - Data: 000 15 ffffffb1 ffffffad ffffffc7 03 ffffffb6 53 33 - Data: 008 27 52 52 ffffffad fffffff7 1f ffffffb2 25 + Data: 000 f0 a9 66 7d 8c f8 4d 0c + Data: 008 1b c3 b6 c4 23 67 25 e6 diff --git a/tests/hello-test/e.exp b/tests/hello-test/e.exp index 6bbc5b6..565ad57 100644 --- a/tests/hello-test/e.exp +++ b/tests/hello-test/e.exp @@ -4,8 +4,8 @@ D: found 1 packages to uninstall D: uninstalling record number 24 D: will remove files test = 0 D: /hello-test/../usr/local/bin/hello - removing -D: /usr/doc/hello-1.0/FAQ - removing -D: /usr/doc/hello-1.0 - removing +D: /hello-test/../usr/doc/hello-1.0/FAQ - removing +D: /hello-test/../usr/doc/hello-1.0 - removing D: running postuninstall script (if any) D: removing database entry D: removing name index @@ -15,6 +15,6 @@ D: removing requiredby index for /bin/sh D: removing requiredby index for ld-linux.so.2 D: removing requiredby index for libc.so.6 D: removing conflict index for goodbye -D: removing file index for /usr/doc/hello-1.0 -D: removing file index for /usr/doc/hello-1.0/FAQ +D: removing file index for /hello-test/../usr/doc/hello-1.0 +D: removing file index for /hello-test/../usr/doc/hello-1.0/FAQ D: removing file index for /hello-test/../usr/local/bin/hello diff --git a/tests/hello-test/i.exp b/tests/hello-test/i.exp index 1760e6e..6240174 100644 --- a/tests/hello-test/i.exp +++ b/tests/hello-test/i.exp @@ -7,20 +7,22 @@ D: New Header signature D: Signature size: 68 D: Signature pad : 4 D: sigsize : 72 -D: Header + Archive: 16835 -D: expected size : 16835 +D: Header + Archive: 13292 +D: expected size : 13292 D: found 0 source and 1 binary packages D: opening database mode: 01002 D: opening database in //var/lib/rpm/ -D: installing binary packages +D: installing binary rpms Installing ../usr/src/redhat/RPMS/sparc/hello-1.0-1.sparc.rpm D: New Header signature D: Signature size: 68 D: Signature pad : 4 D: sigsize : 72 -D: Header + Archive: 16835 -D: expected size : 16835 +D: Header + Archive: 13292 +D: expected size : 13292 D: package: hello-1.0-1 files test = 0 D: relocating /usr/local/bin/hello to /hello-test/../usr/local/bin/hello +D: relocating /usr/doc/hello-1.0/FAQ to /hello-test/../usr/doc/hello-1.0/FAQ +D: relocating /usr/doc/hello-1.0 to /hello-test/../usr/doc/hello-1.0 D: running preinstall script (if any) D: running postinstall script (if any) diff --git a/tests/hello-test/qi.exp b/tests/hello-test/qi.exp index 5da1a86..8855687 100644 --- a/tests/hello-test/qi.exp +++ b/tests/hello-test/qi.exp @@ -1,9 +1,9 @@ Name : hello Distribution: RPM test suite. Version : 1.0 Vendor: Red Hat Software -Release : 1 Build Date: Thu Nov 19 12:33:56 1998 -Install date: Thu Nov 19 12:34:00 1998 Build Host: krusty.devel.redhat.com +Release : 1 Build Date: Tue Mar 9 13:42:25 1999 +Install date: Tue Mar 9 13:42:30 1999 Build Host: sparc9.test.redhat.com Group : Utilities Source RPM: hello-1.0-1.src.rpm -Size : 39336 License: GPL +Size : 31847 License: GPL Packager : Red Hat Software URL : http://www.redhat.com Summary : hello -- hello, world rpm @@ -13,6 +13,6 @@ preinstall program: /bin/sh postinstall program: /bin/sh preuninstall program: /bin/sh postuninstall program: /bin/sh -/home/devel/jbj/src/rpm/tests/usr/doc/hello-1.0 -/home/devel/jbj/src/rpm/tests/usr/doc/hello-1.0/FAQ +/home/devel/jbj/src/rpm/tests/hello-test/../usr/doc/hello-1.0 +/home/devel/jbj/src/rpm/tests/hello-test/../usr/doc/hello-1.0/FAQ /home/devel/jbj/src/rpm/tests/hello-test/../usr/local/bin/hello -- 2.7.4