rpms/libguestfs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update libguestfs-find-requires to generate ordinary lib dependencies.

Browse Source 
Note the following important comment in the updated script:

<quote>
Note this script is *ONLY* applicable to Fedora 17+ (ie. with UsrMove)
since we now assume that /usr/lib{,64} and /lib{,64} are the same
directory and hence that:

  Requires: libfoo.so.1           <=>  /usr/lib/libfoo.so.1 exists
  Requires: libfoo.so.1()(64bit)  <=>  /usr/lib64/libfoo.so.1 exists
</quote>
This commit is contained in:
Richard W.M. Jones 2012-08-02 19:31:26 +01:00
parent 5ce4a10bff
commit fde3bcaf2a
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libguestfs-find-requires.sh
View File

@ -1,5 +1,12 @@
#!/bin/sh - #!/bin/bash -
# Additional custom requires for libguestfs package. # Additional custom requires for libguestfs package.
#
# Note this script is *ONLY* applicable to Fedora 17+ (ie. with UsrMove)
# since we now assume that /usr/lib{,64} and /lib{,64} are the same
# directory and hence that:
#
# Requires: libfoo.so.1 <=> /usr/lib/libfoo.so.1 exists
# Requires: libfoo.so.1()(64bit) <=> /usr/lib64/libfoo.so.1 exists
original_find_requires="$1" original_find_requires="$1"
shift shift
@ -18,9 +25,13 @@ if [ -z "$hostfiles" ]; then
fi fi
# Generate extra requires for libraries listed in hostfiles. # Generate extra requires for libraries listed in hostfiles.
sofiles=`grep 'lib.*\.so\.' $hostfiles | fgrep -v '*' | sed 's|^\.||'` sofiles=`grep 'lib.*\.so\.' $hostfiles | fgrep -v '*'`
for f in $sofiles; do for f in $sofiles; do
if [ -f "$f" ]; then if [ -f "$f" ]; then
echo "$f" if [[ "$f" =~ /lib64/(.*) ]]; then
echo "${BASH_REMATCH[1]}()(64bit)"
elif [[ "$f" =~ /lib/(.*) ]]; then
echo "${BASH_REMATCH[1]}"
fi
fi fi
done done

5
libguestfs.spec
View File

@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.19.28 Version: 1.19.28
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -997,8 +997,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
%changelog %changelog
* Thu Aug 02 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.28-1 * Thu Aug 02 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.28-2
- New upstream version 1.19.28. - New upstream version 1.19.28.
- Update libguestfs-find-requires to generate ordinary lib dependencies.
* Wed Aug 1 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.27-2 * Wed Aug 1 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.27-2
- Disable tests because of RHBZ#844485. - Disable tests because of RHBZ#844485.