diff options
author | Eric Hameleers <alien@slackware.com> | 2014-04-11 07:16:14 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2014-04-11 07:16:14 +0000 |
commit | 41c30fa73f12366628773c7a753936b77c0573a2 (patch) | |
tree | dc97e023d21dafe8d6d3487a3a22e61357b18c60 /libreoffice/build | |
parent | 9b793947c16c61a5ae0ebc16f4e30c6c612d252a (diff) | |
download | asb-41c30fa73f12366628773c7a753936b77c0573a2.tar.gz asb-41c30fa73f12366628773c7a753936b77c0573a2.tar.xz |
Fix creation of kde-integration and sdkdoc packages
Diffstat (limited to 'libreoffice/build')
-rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 35 | ||||
-rwxr-xr-x | libreoffice/build/libreoffice42.SlackBuild | 35 | ||||
-rwxr-xr-x | libreoffice/build/libreoffice43.SlackBuild | 35 |
3 files changed, 54 insertions, 51 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index a114db2a..12a9684e 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -162,11 +162,11 @@ # * Update. # 4.2.2-1: 13/mar/2014 by Eric Hameleers <alien@slackware.com> # * Update. -# 4.2.3-1: 10/apr/2014 by Eric Hameleers <alien@slackware.com> -# * Update. +# 4.2.3-1: 11/apr/2014 by Eric Hameleers <alien@slackware.com> +# * Update to 4.2.3. # KDE integration libraries and SDK documentation have been # split off the main package and into libreoffice-kde-integration -# and libreoffice-sdkdocs sub-packages. +# and libreoffice-sdkdoc sub-packages. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -974,31 +974,32 @@ fi # Move SDK docs into a separate package - normal users do not need this: echo "Starting split-off of SDK docs from main $PRGNAM package..." -mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} -mv usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk - $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/ -mkdir -p $TMP/package-${PRGNAM}-sdkdocs/install -cat $SRCDIR/slack-desc.sdkdocs \ - $TMP/package-${PRGNAM}-sdkdocs/install/slack-desc -cd $TMP/package-${PRGNAM}-sdkdocs - /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +mkdir -p \ + $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} +mv usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk \ + $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} +mkdir -p $TMP/package-${PRGNAM}-sdkdoc/install +cat $SRCDIR/slack-desc.sdkdoc \ + > $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc +cd $TMP/package-${PRGNAM}-sdkdoc + /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.${PKGTYPE:-txz} cd - cd $OUTPUT - md5sum ${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 + md5sum ${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $TMP/package-${PRGNAM}-sdkdocs/install/slack-desc | grep "^${PRGNAM}-sdkdocs" > $OUTPUT/${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt +cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc" > $OUTPUT/${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.txt # Move the KDE integration libraries into a separate package so that people # have a choice to leave these libraries out: echo "Starting split-off of KDE integration libraries from main $PRGNAM package..." -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program +mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program for KDEFILE in libvclplug_kde4lo.so kde-open-url libkde4be1lo.so ; do -mv usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \ - $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ + mv usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \ + $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ done mkdir -p $TMP/package-${PRGNAM}-kde-integration/install cat $SRCDIR/slack-desc.kde \ - $TMP/package-${PRGNAM}-kde-integration/install/slack-desc + > $TMP/package-${PRGNAM}-kde-integration/install/slack-desc cd $TMP/package-${PRGNAM}-kde-integration /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd - diff --git a/libreoffice/build/libreoffice42.SlackBuild b/libreoffice/build/libreoffice42.SlackBuild index a114db2a..12a9684e 100755 --- a/libreoffice/build/libreoffice42.SlackBuild +++ b/libreoffice/build/libreoffice42.SlackBuild @@ -162,11 +162,11 @@ # * Update. # 4.2.2-1: 13/mar/2014 by Eric Hameleers <alien@slackware.com> # * Update. -# 4.2.3-1: 10/apr/2014 by Eric Hameleers <alien@slackware.com> -# * Update. +# 4.2.3-1: 11/apr/2014 by Eric Hameleers <alien@slackware.com> +# * Update to 4.2.3. # KDE integration libraries and SDK documentation have been # split off the main package and into libreoffice-kde-integration -# and libreoffice-sdkdocs sub-packages. +# and libreoffice-sdkdoc sub-packages. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -974,31 +974,32 @@ fi # Move SDK docs into a separate package - normal users do not need this: echo "Starting split-off of SDK docs from main $PRGNAM package..." -mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} -mv usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk - $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/ -mkdir -p $TMP/package-${PRGNAM}-sdkdocs/install -cat $SRCDIR/slack-desc.sdkdocs \ - $TMP/package-${PRGNAM}-sdkdocs/install/slack-desc -cd $TMP/package-${PRGNAM}-sdkdocs - /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +mkdir -p \ + $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} +mv usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk \ + $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} +mkdir -p $TMP/package-${PRGNAM}-sdkdoc/install +cat $SRCDIR/slack-desc.sdkdoc \ + > $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc +cd $TMP/package-${PRGNAM}-sdkdoc + /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.${PKGTYPE:-txz} cd - cd $OUTPUT - md5sum ${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 + md5sum ${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $TMP/package-${PRGNAM}-sdkdocs/install/slack-desc | grep "^${PRGNAM}-sdkdocs" > $OUTPUT/${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt +cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc" > $OUTPUT/${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.txt # Move the KDE integration libraries into a separate package so that people # have a choice to leave these libraries out: echo "Starting split-off of KDE integration libraries from main $PRGNAM package..." -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program +mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program for KDEFILE in libvclplug_kde4lo.so kde-open-url libkde4be1lo.so ; do -mv usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \ - $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ + mv usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \ + $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ done mkdir -p $TMP/package-${PRGNAM}-kde-integration/install cat $SRCDIR/slack-desc.kde \ - $TMP/package-${PRGNAM}-kde-integration/install/slack-desc + > $TMP/package-${PRGNAM}-kde-integration/install/slack-desc cd $TMP/package-${PRGNAM}-kde-integration /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd - diff --git a/libreoffice/build/libreoffice43.SlackBuild b/libreoffice/build/libreoffice43.SlackBuild index a114db2a..12a9684e 100755 --- a/libreoffice/build/libreoffice43.SlackBuild +++ b/libreoffice/build/libreoffice43.SlackBuild @@ -162,11 +162,11 @@ # * Update. # 4.2.2-1: 13/mar/2014 by Eric Hameleers <alien@slackware.com> # * Update. -# 4.2.3-1: 10/apr/2014 by Eric Hameleers <alien@slackware.com> -# * Update. +# 4.2.3-1: 11/apr/2014 by Eric Hameleers <alien@slackware.com> +# * Update to 4.2.3. # KDE integration libraries and SDK documentation have been # split off the main package and into libreoffice-kde-integration -# and libreoffice-sdkdocs sub-packages. +# and libreoffice-sdkdoc sub-packages. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -974,31 +974,32 @@ fi # Move SDK docs into a separate package - normal users do not need this: echo "Starting split-off of SDK docs from main $PRGNAM package..." -mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} -mv usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk - $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/ -mkdir -p $TMP/package-${PRGNAM}-sdkdocs/install -cat $SRCDIR/slack-desc.sdkdocs \ - $TMP/package-${PRGNAM}-sdkdocs/install/slack-desc -cd $TMP/package-${PRGNAM}-sdkdocs - /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +mkdir -p \ + $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} +mv usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk \ + $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} +mkdir -p $TMP/package-${PRGNAM}-sdkdoc/install +cat $SRCDIR/slack-desc.sdkdoc \ + > $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc +cd $TMP/package-${PRGNAM}-sdkdoc + /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.${PKGTYPE:-txz} cd - cd $OUTPUT - md5sum ${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 + md5sum ${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - -cat $TMP/package-${PRGNAM}-sdkdocs/install/slack-desc | grep "^${PRGNAM}-sdkdocs" > $OUTPUT/${PRGNAM}-sdkdocs-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt +cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc" > $OUTPUT/${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.txt # Move the KDE integration libraries into a separate package so that people # have a choice to leave these libraries out: echo "Starting split-off of KDE integration libraries from main $PRGNAM package..." -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program +mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program for KDEFILE in libvclplug_kde4lo.so kde-open-url libkde4be1lo.so ; do -mv usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \ - $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ + mv usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \ + $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ done mkdir -p $TMP/package-${PRGNAM}-kde-integration/install cat $SRCDIR/slack-desc.kde \ - $TMP/package-${PRGNAM}-kde-integration/install/slack-desc + > $TMP/package-${PRGNAM}-kde-integration/install/slack-desc cd $TMP/package-${PRGNAM}-kde-integration /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-kde-integration-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd - |