Enhanced hello.spec.

CVS patchset: 2468
CVS date: 1998/10/20 15:36:12

diff --git a/tests/.cvsignore b/tests/.cvsignore
new file mode 100644 (file)
index 0000000..5c77122
--- /dev/null
+++ b/tests/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+rpmrc
+macros
+usr
+bin
+var

diff --git a/tests/hello-test/.cvsignore b/tests/hello-test/.cvsignore
new file mode 100644 (file)
index 0000000..3cfa6e7
--- /dev/null
+++ b/tests/hello-test/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+*.out

diff --git a/tests/hello-test/ba b/tests/hello-test/ba
index 1957bb5..1c509f0 100755 (executable)
--- a/tests/hello-test/ba
+++ b/tests/hello-test/ba
@@ -10,7 +10,7 @@ cp hello-1.0.tar.gz ../usr/src/redhat/SOURCES
 zcat hello-1.0.tar.gz | tar xOf - \*.spec > ../usr/src/redhat/SPECS/hello.spec
 
 ${DBGX} $rpm -ba ../usr/src/redhat/SPECS/hello.spec 2>&1 | \
-       sed -e "s,$destdir,,g" -e '/^make\[[0-9][0-9]*\]:/d' > test0.out
+       sed -e "s,$destdir,,g" -e '/^make\[[0-9][0-9]*\]:/d' > $0.out
 
-diff test0.out test0.exp || exit 1
+diff $0.out $0.exp || exit 1
 

diff --git a/tests/hello-test/ba.exp b/tests/hello-test/ba.exp
index 45b5ea4..f649abe 100644 (file)
--- a/tests/hello-test/ba.exp
+++ b/tests/hello-test/ba.exp
@@ -27,8 +27,19 @@ Executing: %install
 install -m 0755 hello /var/tmp/hello-root/usr/local/bin
 + exit 0
 Processing files: hello
+Executing: %doc
++ umask 022
++ cd /usr/src/redhat/BUILD
++ cd hello-1.0
++ DOCDIR=/var/tmp/hello-root/usr/doc/hello-1.0
++ export DOCDIR
++ rm -rf /var/tmp/hello-root/usr/doc/hello-1.0
++ /bin/mkdir -p /var/tmp/hello-root/usr/doc/hello-1.0
++ cp -pr FAQ /var/tmp/hello-root/usr/doc/hello-1.0
++ exit 0
 Finding provides...
 Finding requires...
+Prereqs: /bin/sh
 Requires: ld-linux.so.2 libc.so.6
 Wrote: /usr/src/redhat/SRPMS/hello-1.0-1.src.rpm
 Wrote: /usr/src/redhat/RPMS/sparc/hello-1.0-1.sparc.rpm

diff --git a/tests/hello-test/ckC.exp b/tests/hello-test/ckC.exp
index a42e4a9..dc1491a 100644 (file)
--- a/tests/hello-test/ckC.exp
+++ b/tests/hello-test/ckC.exp
@@ -1 +1,3 @@
+home/devel/jbj/src/rpm/tests/usr/doc/hello-1.0
+home/devel/jbj/src/rpm/tests/usr/doc/hello-1.0/FAQ
 usr/local/bin/hello

diff --git a/tests/hello-test/ckH.exp b/tests/hello-test/ckH.exp
index dffef4a..b9f0a4a 100644 (file)
--- a/tests/hello-test/ckH.exp
+++ b/tests/hello-test/ckH.exp
@@ -1,4 +1,4 @@
-Entry count: 34
+Entry count: 42
 
              CT  TAG                  TYPE               OFSET      COUNT
 Entry      : 000 (100)(unknown)      STRING_ARRAY_TYPE  0xffffffff 00000001
@@ -14,61 +14,108 @@ Entry      : 004 (1004)RPMTAG_SUMMARY I18N_STRING_TYPE   0xffffffff 00000001
 Entry      : 005 (1005)RPMTAG_DESCRIPTION I18N_STRING_TYPE   0xffffffff 00000001
        Data: 000 Simple rpm demonstration.
 Entry      : 006 (1006)RPMTAG_BUILDTIME INT32_TYPE         0xffffffff 00000001
-       Data: 000 0x362c9f02 (908893954)
+       Data: 000 0x362cac47 (908897351)
 Entry      : 007 (1007)RPMTAG_BUILDHOST STRING_TYPE        0xffffffff 00000001
        Data: 000 krusty.devel.redhat.com
 Entry      : 008 (1009)RPMTAG_SIZE    INT32_TYPE         0xffffffff 00000001
-       Data: 000 0x00007843 (30787)
+       Data: 000 0x00007c67 (31847)
 Entry      : 009 (1014)RPMTAG_LICENSE STRING_TYPE        0xffffffff 00000001
        Data: 000 GPL
 Entry      : 010 (1016)RPMTAG_GROUP   I18N_STRING_TYPE   0xffffffff 00000001
        Data: 000 Utilities
-Entry      : 011 (1021)RPMTAG_OS      STRING_TYPE        0xffffffff 00000001
+Entry      : 011 (1020)RPMTAG_URL     STRING_TYPE        0xffffffff 00000001
+       Data: 000 http://www.redhat.com
+Entry      : 012 (1021)RPMTAG_OS      STRING_TYPE        0xffffffff 00000001
        Data: 000 Linux
-Entry      : 012 (1022)RPMTAG_ARCH    STRING_TYPE        0xffffffff 00000001
+Entry      : 013 (1022)RPMTAG_ARCH    STRING_TYPE        0xffffffff 00000001
        Data: 000 sparc
-Entry      : 013 (1027)RPMTAG_FILENAMES STRING_ARRAY_TYPE  0xffffffff 00000001
-       Data: 000 /usr/local/bin/hello
-Entry      : 014 (1028)RPMTAG_FILESIZES INT32_TYPE         0xffffffff 00000001
-       Data: 000 0x00007843 (30787)
-Entry      : 015 (1030)RPMTAG_FILEMODES INT16_TYPE         0xffffffff 00000001
-       Data: 000 0xffff81ed (-32275)
-Entry      : 016 (1033)RPMTAG_FILERDEVS INT16_TYPE         0xffffffff 00000001
+Entry      : 014 (1027)RPMTAG_FILENAMES STRING_ARRAY_TYPE  0xffffffff 00000003
+       Data: 000 /home/devel/jbj/src/rpm/tests/usr/doc/hello-1.0
+       Data: 001 /home/devel/jbj/src/rpm/tests/usr/doc/hello-1.0/FAQ
+       Data: 002 /usr/local/bin/hello
+Entry      : 015 (1028)RPMTAG_FILESIZES INT32_TYPE         0xffffffff 00000003
+       Data: 000 0x00000400 (1024)
+       Data: 001 0x00000024 (36)
+       Data: 002 0x00007843 (30787)
+Entry      : 016 (1030)RPMTAG_FILEMODES INT16_TYPE         0xffffffff 00000003
+       Data: 000 0x41ed (16877)
+       Data: 001 0xffff81a4 (-32348)
+       Data: 002 0xffff81e9 (-32279)
+Entry      : 017 (1033)RPMTAG_FILERDEVS INT16_TYPE         0xffffffff 00000003
        Data: 000 0x0000 (0)
-Entry      : 017 (1034)RPMTAG_FILEMTIMES INT32_TYPE         0xffffffff 00000001
-       Data: 000 0x362c9efe (908893950)
-Entry      : 018 (1035)RPMTAG_FILEMD5S STRING_ARRAY_TYPE  0xffffffff 00000001
-       Data: 000 741e702cdf114c95a9e965fa8aa40864
-Entry      : 019 (1036)RPMTAG_FILELINKTOS STRING_ARRAY_TYPE  0xffffffff 00000001
+       Data: 001 0x0000 (0)
+       Data: 002 0x0000 (0)
+Entry      : 018 (1034)RPMTAG_FILEMTIMES INT32_TYPE         0xffffffff 00000003
+       Data: 000 0x362cac42 (908897346)
+       Data: 001 0x362ca336 (908895030)
+       Data: 002 0x362cac42 (908897346)
+Entry      : 019 (1035)RPMTAG_FILEMD5S STRING_ARRAY_TYPE  0xffffffff 00000003
        Data: 000 
-Entry      : 020 (1037)RPMTAG_FILEFLAGS INT32_TYPE         0xffffffff 00000001
+       Data: 001 33cccc1f055d73acaceed7d8204e99c7
+       Data: 002 741e702cdf114c95a9e965fa8aa40864
+Entry      : 020 (1036)RPMTAG_FILELINKTOS STRING_ARRAY_TYPE  0xffffffff 00000003
+       Data: 000 
+       Data: 001 
+       Data: 002 
+Entry      : 021 (1037)RPMTAG_FILEFLAGS INT32_TYPE         0xffffffff 00000003
        Data: 000 0x00000000 (0)
-Entry      : 021 (1039)RPMTAG_FILEUSERNAME STRING_ARRAY_TYPE  0xffffffff 00000001
+       Data: 001 0x00000002 (2)
+       Data: 002 0x00000000 (0)
+Entry      : 022 (1039)RPMTAG_FILEUSERNAME STRING_ARRAY_TYPE  0xffffffff 00000003
        Data: 000 root
-Entry      : 022 (1040)RPMTAG_FILEGROUPNAME STRING_ARRAY_TYPE  0xffffffff 00000001
+       Data: 001 root
+       Data: 002 root
+Entry      : 023 (1040)RPMTAG_FILEGROUPNAME STRING_ARRAY_TYPE  0xffffffff 00000003
        Data: 000 root
-Entry      : 023 (1044)RPMTAG_SOURCERPM STRING_TYPE        0xffffffff 00000001
+       Data: 001 root
+       Data: 002 root
+Entry      : 024 (1044)RPMTAG_SOURCERPM STRING_TYPE        0xffffffff 00000001
        Data: 000 hello-1.0-1.src.rpm
-Entry      : 024 (1045)RPMTAG_FILEVERIFYFLAGS INT32_TYPE         0xffffffff 00000001
-       Data: 000 0xffffffff (-1)
-Entry      : 025 (1046)RPMTAG_ARCHIVESIZE INT32_TYPE         0xffffffff 00000001
-       Data: 000 0x00007944 (31044)
-Entry      : 026 (1048)RPMTAG_REQUIREFLAGS INT32_TYPE         0xffffffff 00000002
+Entry      : 025 (1045)RPMTAG_FILEVERIFYFLAGS INT32_TYPE         0xffffffff 00000003
        Data: 000 0x00000000 (0)
        Data: 001 0x00000000 (0)
-Entry      : 027 (1049)RPMTAG_REQUIRENAME STRING_ARRAY_TYPE  0xffffffff 00000002
-       Data: 000 ld-linux.so.2
-       Data: 001 libc.so.6
-Entry      : 028 (1050)RPMTAG_REQUIREVERSION STRING_ARRAY_TYPE  0xffffffff 00000002
+       Data: 002 0xffffffff (-1)
+Entry      : 026 (1046)RPMTAG_ARCHIVESIZE INT32_TYPE         0xffffffff 00000001
+       Data: 000 0x00007aac (31404)
+Entry      : 027 (1048)RPMTAG_REQUIREFLAGS INT32_TYPE         0xffffffff 00000003
+       Data: 000 0x00000040 (64)
+       Data: 001 0x00000000 (0)
+       Data: 002 0x00000000 (0)
+Entry      : 028 (1049)RPMTAG_REQUIRENAME STRING_ARRAY_TYPE  0xffffffff 00000003
+       Data: 000 /bin/sh
+       Data: 001 ld-linux.so.2
+       Data: 002 libc.so.6
+Entry      : 029 (1050)RPMTAG_REQUIREVERSION STRING_ARRAY_TYPE  0xffffffff 00000003
        Data: 000 
        Data: 001 
-Entry      : 029 (1064)RPMTAG_RPMVERSION STRING_TYPE        0xffffffff 00000001
+       Data: 002 
+Entry      : 030 (1064)RPMTAG_RPMVERSION STRING_TYPE        0xffffffff 00000001
        Data: 000 2.90
-Entry      : 030 (1094)RPMTAG_COOKIE  STRING_TYPE        0xffffffff 00000001
-       Data: 000 krusty.devel.redhat.com 908893954
-Entry      : 031 (1095)RPMTAG_FILEDEVICES INT32_TYPE         0xffffffff 00000001
+Entry      : 031 (1080)RPMTAG_CHANGELOGTIME INT32_TYPE         0xffffffff 00000001
+       Data: 000 0x362cf9d0 (908917200)
+Entry      : 032 (1081)RPMTAG_CHANGELOGNAME STRING_ARRAY_TYPE  0xffffffff 00000001
+       Data: 000 Jeff Johnson <jbj@redhat.com>
+Entry      : 033 (1082)RPMTAG_CHANGELOGTEXT STRING_ARRAY_TYPE  0xffffffff 00000001
+       Data: 000 - create.
+Entry      : 034 (1085)RPMTAG_PREINPROG STRING_TYPE        0xffffffff 00000001
+       Data: 000 /bin/sh
+Entry      : 035 (1086)RPMTAG_POSTINPROG STRING_TYPE        0xffffffff 00000001
+       Data: 000 /bin/sh
+Entry      : 036 (1087)RPMTAG_PREUNPROG STRING_TYPE        0xffffffff 00000001
+       Data: 000 /bin/sh
+Entry      : 037 (1088)RPMTAG_POSTUNPROG STRING_TYPE        0xffffffff 00000001
+       Data: 000 /bin/sh
+Entry      : 038 (1094)RPMTAG_COOKIE  STRING_TYPE        0xffffffff 00000001
+       Data: 000 krusty.devel.redhat.com 908897351
+Entry      : 039 (1095)RPMTAG_FILEDEVICES INT32_TYPE         0xffffffff 00000003
        Data: 000 0x00000804 (2052)
-Entry      : 032 (1096)RPMTAG_FILEINODES INT32_TYPE         0xffffffff 00000001
-       Data: 000 0x00010de6 (69094)
-Entry      : 033 (1097)RPMTAG_FILELANGS STRING_ARRAY_TYPE  0xffffffff 00000001
+       Data: 001 0x00000804 (2052)
+       Data: 002 0x00000804 (2052)
+Entry      : 040 (1096)RPMTAG_FILEINODES INT32_TYPE         0xffffffff 00000003
+       Data: 000 0x0001bc87 (113799)
+       Data: 001 0x0001bc88 (113800)
+       Data: 002 0x00010de6 (69094)
+Entry      : 041 (1097)RPMTAG_FILELANGS STRING_ARRAY_TYPE  0xffffffff 00000003
        Data: 000 
+       Data: 001 
+       Data: 002 

diff --git a/tests/hello-test/hello-1.0.tar.gz b/tests/hello-test/hello-1.0.tar.gz
index 7000ed3..88ecd72 100644 (file)
Binary files a/tests/hello-test/hello-1.0.tar.gz and b/tests/hello-test/hello-1.0.tar.gz differ

diff --git a/tests/hello-test/hello-1.0/COPYING b/tests/hello-test/hello-1.0/COPYING
new file mode 100644 (file)
index 0000000..ba4db35
--- /dev/null
+++ b/tests/hello-test/hello-1.0/COPYING
@@ -0,0 +1 @@
+This is the license file COPYING for hello-1.0.

diff --git a/tests/hello-test/hello-1.0/FAQ b/tests/hello-test/hello-1.0/FAQ
new file mode 100644 (file)
index 0000000..c2b55e1
--- /dev/null
+++ b/tests/hello-test/hello-1.0/FAQ
@@ -0,0 +1 @@
+This is the FAQ file for hello-1.0.

diff --git a/tests/hello-test/hello-1.0/hello.spec b/tests/hello-test/hello-1.0/hello.spec
index d33216b..23052ce 100644 (file)
--- a/tests/hello-test/hello-1.0/hello.spec
+++ b/tests/hello-test/hello-1.0/hello.spec
@@ -4,6 +4,7 @@ Version: 1.0
 Release: 1
 Group: Utilities
 License: GPL
+URL: http://www.redhat.com
 Source0: hello-1.0.tar.gz
 BuildRoot: /var/tmp/hello-root
 
@@ -24,6 +25,21 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+
+%post
+
+%preun
+
+%postun
+
 %files
 %defattr(-,root,root)
-/usr/local/bin/hello
+%doc   FAQ
+#%readme README
+#%license COPYING
+%attr(0751,root,root)  /usr/local/bin/hello
+
+%changelog
+* Tue Oct 20 1998 Jeff Johnson <jbj@redhat.com>
+- create.

diff --git a/tests/hello-test/showrc b/tests/hello-test/showrc
index 4b6f27c..020aa5b 100755 (executable)
--- a/tests/hello-test/showrc
+++ b/tests/hello-test/showrc
@@ -6,6 +6,6 @@ rpm=${rpm:=rpm}
 destdir="`pwd`"
 destdir="`dirname $destdir`"
 
-${DBGX} $rpm --showrc 2>&1 | sed -e "s,$destdir,," > showrc.out
+${DBGX} $rpm --showrc 2>&1 | sed -e "s,$destdir,," > $0.out
 
-diff showrc.out showrc.exp || exit 0
+diff $0.out $0.exp || exit 0