|
|
Author: jcm
Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25906
Modified Files:
redhat-rpm-config.spec
Added Files:
redhat-rpm-config-find-requires.patch
Log Message:
update find-requires handling
redhat-rpm-config-find-requires.patch:
find-requires | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
--- NEW FILE redhat-rpm-config-find-requires.patch ---
diff -urN redhat-rpm-config-8.0.45_orig/find-requires
redhat-rpm-config-8.0.45/find-requires
--- redhat-rpm-config-8.0.45_orig/find-requires 2006-07-30 19:58:01.000000000
+0100
+++ redhat-rpm-config-8.0.45/find-requires 2006-10-12 04:55:41.000000000
+0100
@@ -5,11 +5,6 @@
# sonames, script interpreters, and perl modules.
#
-if [ "$1" ]
-then
- package_name = "$1"
-fi
-
ulimit -c 0
#
@@ -144,21 +139,18 @@
# cheat a little here by looking first for a kernel, then for a kmod.
#
-is_kmod=1
+unset is_kmod
+
for f in $filelist; do
if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ]
then
- is_kernel=1;
- fi
- if [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ]
+ is_kmod=1;
+ elif [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ]
then
- unset is_kmod;
+ unset is_kmod;
+ break;
fi
done
-if [ ! "$is_kernel" ] || [ "$package_name" == "kernel" ]
-then
- unset is_kmod
-fi
[ -x /usr/lib/rpm/redhat/find-requires.ksyms ] && [ "$is_kmod" ] &&
printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/redhat/find-requires.ksyms
Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- redhat-rpm-config.spec 12 Sep 2006 22:24:31 -0000 1.37
+++ redhat-rpm-config.spec 12 Oct 2006 04:01:29 -0000 1.38
@@ -1,12 +1,13 @@
Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config
Version: 8.0.45
-Release: 6
+Release: 7
License: GPL
Group: Development/System
Source: redhat-rpm-config-%{version}.tar.gz
Source1: brp-java-repack-jars
Patch0: redhat-rpm-config-java.patch
+Patch1: redhat-rpm-config-find-requires.patch
BuildArch: noarch
#Requires: rpmbuild(VendorConfig) <= 4.1
#Requires: mktemp
@@ -30,6 +31,7 @@
chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/config.{guess,sub}
(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH0})
+(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH1})
install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
%clean
@@ -40,6 +42,9 @@
%{_prefix}/lib/rpm/redhat
%changelog
+* Thu Oct 12 2006 Jon Masters <jcm@xxxxxxxxxx> 8.0.45-7
+- Added patch for find-requires. Waiting on write access to public CVS.
+
* Tue Sep 12 2006 Deepak Bhole <dbhole@xxxxxxxxxx> 8.0.45-6
- Fix brp-java-repack-jars to work with builddirs that aren't %name-%version
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|