diff --git a/libraries/urdfdom_headers/urdfdom_headers.SlackBuild b/libraries/urdfdom_headers/urdfdom_headers.SlackBuild index 2e0463d584..af44399eee 100644 --- a/libraries/urdfdom_headers/urdfdom_headers.SlackBuild +++ b/libraries/urdfdom_headers/urdfdom_headers.SlackBuild @@ -22,11 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20240330 bkw: Modified by SlackBuilds.org, BUILD=2: +# - pkg-config file was getting installed to /usr/lib on x86_64, fix. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=urdfdom_headers VERSION=${VERSION:-0.4.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -75,9 +75,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} + -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + mkdir -p build cd build @@ -90,8 +90,7 @@ cd build make install DESTDIR=$PKG cd .. -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +[ "$LIBDIRSUFFIX" != "" ] && mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/urdfdom_headers/urdfdom_headers.info b/libraries/urdfdom_headers/urdfdom_headers.info index 2511f6680d..4eef635ae8 100644 --- a/libraries/urdfdom_headers/urdfdom_headers.info +++ b/libraries/urdfdom_headers/urdfdom_headers.info @@ -1,7 +1,7 @@ PRGNAM="urdfdom_headers" VERSION="0.4.1" HOMEPAGE="http://wiki.ros.org/urdf" -DOWNLOAD="https://github.com/ros/urdfdom_headers/archive/0.4.1.tar.gz" +DOWNLOAD="https://github.com/ros/urdfdom_headers/archive/0.4.1/urdfdom_headers-0.4.1.tar.gz" MD5SUM="73cfc08b936231a78dc899df5ebd269d" DOWNLOAD_x86_64="" MD5SUM_x86_64=""