diff --git a/package/mk_rpm.sh b/package/mk_rpm.sh index 7b5aadf..5049797 100644 --- a/package/mk_rpm.sh +++ b/package/mk_rpm.sh @@ -17,6 +17,9 @@ # 2021/05/15 # don't add gnome-shell-extension-appindicator to dependencies, # it pulls in half of Gnome desktop, non gnome users would hate me. +# 2023-12-13 +# Force a Minium libqt5pas of 1.2.15, this will need constant attention. +# Add a qt5 amd64 rpm # ==================================================== PROD=tomboy-ng @@ -30,11 +33,14 @@ function DoAlien () { ARCH="$1" rm -Rf "$RDIR" # Note, debs have a dash after initial version number, RPM an underscore - if [ "$1" = amd64Qt ]; then + if [ "$1" = amd64Qt5 ]; then # FILENAME="tomboy-ngQt_0.24b-0_amd64.deb" ARCH=x86_64 fi - if [ "$1" = amd64 ]; then + if [ "$1" = amd64Qt6 ]; then + ARCH=x86_64 + fi + if [ "$1" = amd64 ]; then # the gtk2 version ARCH=x86_64 fi if [ "$1" = i386 ]; then @@ -43,7 +49,7 @@ function DoAlien () { echo "--- RDIR=$RDIR and building for $1 using $FILENAME ---------" alien -r -g -v -k "$FILENAME" - # Alien inserts requests the package create / and /usr/bin and + # Alien requests the package create / and /usr/bin and # the os does not apprieciate that, not surprisingly. # This removes the %dir / sed -i "s/^Release:.*/Release: $PACKVER/" "$RDIR"/"$RDIR"-"$PACKVER".spec @@ -59,11 +65,15 @@ function DoAlien () { sed -i '10i Packager: David Bannon ' "$RDIR"/"$RDIR"-"$PACKVER".spec sed -i '11i URL: https://githup.com/tomboy/tomboy-ng' "$RDIR"/"$RDIR"-"$PACKVER".spec - + echo "------------ Setting Minium libqt5pas to 1.2.15 --------------------------- + sed -i '12i Requires: libqt5pas >= 1.2.15' "$RDIR"/"$RDIR"-"$PACKVER".spec gunzip "$RDIR"/usr/share/man/man1/tomboy-ng.1.gz bzip2 "$RDIR"/usr/share/man/man1/tomboy-ng.1 sed -i "s/tomboy-ng.1.gz/tomboy-ng.1.bz2/" "$RDIR"/"$RDIR"-"$PACKVER".spec + +cp "$RDIR"/"$RDIR"-"$PACKVER".spec "$1".spec + echo "%changelog" >> "$RDIR"/"$RDIR"-"$PACKVER".spec CHDATE=`date +"%a %b %d %Y"` CHDATE="* $CHDATE David Bannon $VERS"-"$PACKVER" @@ -83,15 +93,19 @@ function DoAlien () { cp "$RDIR"-"$PACKVER".spec ../../"$RDIR"-"$PACKVER".spec-"$1" rpmbuild --target "$ARCH" --buildroot "$PWD" -bb "$RDIR"-"$PACKVER".spec cd .. - # if its a Qt one, rename it so it does not get overwritten subsquently - if [ "$1" = amd64Qt ]; then - mv "$RDIR"-"$PACKVER"."$ARCH".rpm "$PROD"Qt-"$VERS"-"$PACKVER"."$ARCH".rpm + # if its a Qt5 one, rename it so it does not get overwritten subsquently + if [ "$1" = amd64Qt5 ]; then + mv "$RDIR"-"$PACKVER"."$ARCH".rpm "$PROD"Qt5-"$VERS"-"$PACKVER"."$ARCH".rpm + fi + if [ "$1" = amd64Qt6 ]; then + mv "$RDIR"-"$PACKVER"."$ARCH".rpm "$PROD"Qt6-"$VERS"-"$PACKVER"."$ARCH".rpm fi } rm -f tom*.rpm # Must do the "non std" ones first, else have overwrite problems -DoAlien "amd64Qt" +DoAlien "amd64Qt5" +DoAlien "amd64Qt6" DoAlien "i386" DoAlien "amd64" chown "$SUDO_USER" *.rpm diff --git a/package/package.bash b/package/package.bash index d03fb22..9c270e2 100644 --- a/package/package.bash +++ b/package/package.bash @@ -81,7 +81,7 @@ function ModeParamArch () { # expects to be called like ARCH=$(ModeParamArch R echo "i386" ;; ReleaseQT5) - echo "amd64Qt" + echo "amd64Qt5" ;; ReleaseRasPi) echo "armhf" @@ -90,11 +90,11 @@ function ModeParamArch () { # expects to be called like ARCH=$(ModeParamArch R echo "arm64" ;; ReleaseQT6) - echo "amd64Qt6" - ;; - ReleaseLin32Qt5) - echo "i386Qt5" - ;; + echo "amd64Qt6" + ;; + ReleaseLin32Qt5) + echo "i386Qt5" + ;; esac } @@ -233,7 +233,7 @@ function DebianPackage () { "ReleaseQT6") # echo "++++++++++ Setting QT6 +++++++++" CTRL_ARCH="amd64" - CTRL_DEPENDS="libqt6pas6, libc6 (>= 2.34), wmctrl, libnotify-bin, libqt6pas6 (>= 6.2.7)" + CTRL_DEPENDS="libc6 (>= 2.34), wmctrl, libnotify-bin, libqt6pas6 (>= 6.2.7)" CTRL_RELEASE="Qt6 release." # we must force qt6 app to use qt6ct because of a bug in qt6.tsavedialog, no, not using Laz300 # note ugly syntax, qt6 strips it off (and anything after it) before app sees it. diff --git a/package/version b/package/version index 5488c6a..54c78da 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.36h +0.36i