From 5c1b6d0ba65278ffe440bd2ce4b4213e9e2d3f32 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Thu, 2 Mar 2000 20:21:10 +0000
Subject: simpler hpux.prov script (Tim Mooney).

CVS patchset: 3606
CVS date: 2000/03/02 20:21:10
---
 CHANGES            |  1 +
 autodeps/hpux.prov | 33 ++++++++++++++++++++++-----------
 rpm.spec           |  5 ++++-
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9ed057a1e..33e081f72 100644
--- a/CHANGES
+++ b/CHANGES
@@ -62,6 +62,7 @@
 	- try for /etc/rpm/macros.specspo so that specspo autoconfigures rpm.
 	- per-platform configuration factored into /usr/lib/rpm subdir.
 	- sparc-sun-solaris2.6 portability check.
+	- simpler hpux.prov script (Tim Mooney).
 
 3.0.2 -> 3.0.3
 	- add --eval to find result of macro expansion.
diff --git a/autodeps/hpux.prov b/autodeps/hpux.prov
index 2a8331b34..4a2ee108d 100644
--- a/autodeps/hpux.prov
+++ b/autodeps/hpux.prov
@@ -1,7 +1,7 @@
 #! /usr/bin/ksh
 
 # Original Author: Tim Mooney (mooney@plains.nodak.edu)
-# $Id: hpux.prov,v 1.5 1999/09/30 00:22:15 jbj Exp $
+# $Id: hpux.prov,v 1.6 2000/03/02 20:21:10 jbj Exp $
 #
 # This file is distributed under the terms of the GNU Public License
 #
@@ -34,6 +34,13 @@
 #         instruction page size: 4K
 #
 
+#
+# Implementation notes: some of the system libraries are built without an
+# `internal name' (HP-UX's equivalent to a SONAME), so I need to track what
+# chatr outputs as its first line.  We'll use the basename of that line in
+# the event of no internal name.
+#
+
 PATH=/usr/bin:/usr/sbin:/usr/ccs/bin
 export PATH
 
@@ -44,6 +51,10 @@ export PATH
 IFS=""
 while read f
 do
+	# It's possible that I should be testing to make sure that the file
+	# we're trying isn't a symlink,  and skipping it if it is, because of
+	# the possible odd situation where we could have a link to a library
+	# with no internal name.  This would need more investigation, though.
 	chatr $f 2>/dev/null \
 	| awk '
 
@@ -51,6 +62,12 @@ do
 			FS = " ";
 			RS = "\n";
 
+			# This flag signfies that we have seen the internal name:
+			# marker.  Once we see that, we set the flag to 1.  The next
+			# line we read should contain the library internal name, the
+			# SOM equivalent of an soname.  At that point we set the flag
+			# found_internal_name to 1 and exit
+			# the main body of the awk script, going through the END
 			in_internal_name = 0;
 
 			#
@@ -86,15 +103,6 @@ do
 			exit
 		}
 
-		#
-		# If we see this, we know we have passed all the information we care
-		# about, so exit.
-		#
-		/^ +shared library list: *$/ || /^ +static branch prediction/ {
-			in_internal_name = 0
-			exit
-		}
-
 		in_internal_name == 1 {
 		
 			# We found the library internal name.  If it does not contain
@@ -113,10 +121,13 @@ do
 			# an internal name
 			#
 			found_internal_name = 1;
+			in_internal_name = 0
+			exit
 		}
 
 		#
-		# we have hit the internal name section.  Set the flag
+		# we have hit the internal name section.  Set the flag.  The next
+		# line should be what we are looking for.
 		#
 		/^ +internal name: *$/ {
 			in_internal_name = 1
diff --git a/rpm.spec b/rpm.spec
index 21259ff52..3d9d52e76 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.0.4
 Version: %{version}
-Release: 0.48
+Release: 0.49
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -219,6 +219,9 @@ fi
 /usr/include/popt.h
 
 %changelog
+* Thu Mar  2 2000 Jeff Johnson <jbj@redhat.com>
+- simpler hpux.prov script (Tim Mooney).
+
 * Wed Mar  1 2000 Jeff Johnson <jbj@redhat.com>
 - fix rpmmodule.so python bindings.
 
-- 
cgit v1.2.3