diff options
| author |   Eric Hameleers <alien@slackware.com> | 2009-09-14 19:00:42 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2009-09-14 19:00:42 +0000 |
| commit | 7005681fe7ca5bcf325dd8ac30b35ecff36073ba (patch) | |
| tree | 30e17efb7ebeaa6d12b73bfa7dced21bf94c310d | |
| parent | 6ab4e89f28918c2470c5f785dd017d019ba0590f (diff) | |
| download | multilib-7005681fe7ca5bcf325dd8ac30b35ecff36073ba.tar.gz multilib-7005681fe7ca5bcf325dd8ac30b35ecff36073ba.tar.xz | |
Small fix to pango package
Diffstat (limited to '')
| -rwxr-xr-x | compat32-tools/convertpkg-compat32 | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/compat32-tools/convertpkg-compat32 b/compat32-tools/convertpkg-compat32 index e695b45..a68058b 100755 --- a/compat32-tools/convertpkg-compat32 +++ b/compat32-tools/convertpkg-compat32 @@ -153,7 +153,9 @@ cd $PKG || exit 1 # remove for the -compat32 package. /sbin/explodepkg $PKGPATH +# # Take special care of gtk+2 and pango when stripping things! +# # Remove stuff we only want from the 64-bit package: if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "pango" ]; then @@ -174,13 +176,16 @@ fi # Strip doinst.sh from everything we can't use: if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "pango" ]; then - # Get rid of symlinks in bin directory: - cat install/doinst.sh | grep -v '( cd usr/bin' > install/doinst.sh.2 + # Get rid of symlinks in bin and doc directory: + cat install/doinst.sh | grep -v '( cd usr/bin' | grep -v '( cd usr/doc' \ + > install/doinst.sh.2 cat install/doinst.sh.2 > install/doinst.sh rm -f install/doinst.sh.2 - # Deal with the .new file in gtk+2 that does not get processed: - echo "config etc/gtk-2.0/i486-slackware-linux/im-multipress.conf.new" \ - >> install/doinst.sh + if [ "$PKGNAM" = "gtk+2" ]; then + # Deal with the .new file in gtk+2 that does not get processed: + echo "config etc/gtk-2.0/i486-slackware-linux/im-multipress.conf.new" \ + >> install/doinst.sh + fi else # Only keep lines that deal with symlinks in bin/32 and lib directories: cat install/doinst.sh | grep -E '(usr/bin |lib |lib/)' > install/doinst.sh.2 |