diff --git a/check-version.sh b/check-version.sh index a05ca4c..7418d60 100644 --- a/check-version.sh +++ b/check-version.sh @@ -7,6 +7,6 @@ REPO="GNOME/gnome-online-accounts" REPO=$(echo "$REPO" | sed 's|/|%2F|g') # Get tag name using Gitlab Rest API -TAG_NAME=$(curl -s -L https://gitlab.gnome.org/api/v4/projects/"$REPO"/releases/permalink/latest | jq -r '.tag_name') +TAG_NAME=$(curl -s -L https://gitlab.gnome.org/api/v4/projects/"$REPO"/releases | jq -r '.[].tag_name' | sort -V | tail -n1) echo "$TAG_NAME" diff --git a/pkg.info b/pkg.info index 7f2a3b4..928654e 100644 --- a/pkg.info +++ b/pkg.info @@ -1,6 +1,6 @@ name: gnome-online-accounts description: single sign-on framework for GNOME -version: 3.56.1 +version: 3.56.2 revision: 1 url: https://wiki.gnome.org/Projects/GnomeOnlineAccounts license: LGPL2-or-later @@ -9,7 +9,9 @@ type: source make_depends: - dbus - gcr4 + - gi-docgen - glib + - gobject-introspection - gtk4 - json-glib - keyutils @@ -19,14 +21,13 @@ make_depends: - libsecret - libsoup - libxml2 - - gobject-introspection - meson - vala downloads: - - url: https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/archive/${BPM_PKG_VERSION}/gnome-online-accounts-${BPM_PKG_VERSION}.tar.gz + - url: https://download.gnome.org/sources/gnome-online-accounts/${BPM_PKG_VERSION%.*}/gnome-online-accounts-${BPM_PKG_VERSION}.tar.xz extract_to: ${BPM_SOURCE} extract_strip_components: 1 - checksum: dffbd71dffaf67fc20daebc240e573479229564afab4b1f492f4c089dbe6caa7 + checksum: ce88df65457f0e63a0d8daff13322e29ecb584197a187f48a3a21be2fcd1c824 split_packages: - name: gnome-online-accounts depends: @@ -41,6 +42,11 @@ split_packages: - keyutils - krb5 - libadwaita + - libgoa + - librest + - libsecret + - libsoup + - libxml2 - name: libgoa description: Client library for gnome-online-accounts depends: diff --git a/source.sh b/source.sh index 123df50..36b2b16 100644 --- a/source.sh +++ b/source.sh @@ -5,24 +5,37 @@ # The build function is executed in the source directory # This function is used to compile the source code build() { - meson setup build --prefix=/usr --buildtype=release -Ddocumentation=false + meson setup build --prefix=/usr --buildtype=release -Ddocumentation=true -Dman=true meson compile -C build } +_pick() { + local p="$1" f d; shift + for f; do + [ -d "$BPM_WORKDIR"/output_"$p" ] || { echo "Split package $p not found"; exit 1; } + d="$BPM_WORKDIR"/output_"$p"/"${f#$BPM_OUTPUT}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + # The package function is executed in the source directory # This function is used to move the compiled files into the output directory package_gnome-online-accounts() { meson install -C build --destdir="$BPM_OUTPUT" + cd "$BPM_OUTPUT" + # Move libgoa files into split package - install -d "$BPM_WORKDIR"/output_libgoa/usr/{include/goa-1.0,lib/girepository-1.0,lib/goa-1.0,lib/pkgconfig,share/gir-1.0,share/vala/vapi} - mv "$BPM_OUTPUT"/usr/include/goa-1.0/goa "$BPM_WORKDIR"/output_libgoa/usr/include/goa-1.0/goa - mv "$BPM_OUTPUT"/usr/lib/libgoa-1.0.so* -t "$BPM_WORKDIR"/output_libgoa/usr/lib/ - mv "$BPM_OUTPUT"/usr/lib/girepository-1.0/Goa-1.0.typelib "$BPM_WORKDIR"/output_libgoa/usr/lib/girepository-1.0/Goa-1.0.typelib - mv "$BPM_OUTPUT"/usr/lib/goa-1.0/include "$BPM_WORKDIR"/output_libgoa/usr/lib/goa-1.0/include - mv "$BPM_OUTPUT"/usr/lib/pkgconfig/goa-1.0.pc "$BPM_WORKDIR"/output_libgoa/usr/lib/pkgconfig/goa-1.0.pc - mv "$BPM_OUTPUT"/usr/share/gir-1.0/Goa-1.0.gir "$BPM_WORKDIR"/output_libgoa/usr/share/gir-1.0/Goa-1.0.gir - mv "$BPM_OUTPUT"/usr/share/vala/vapi/goa-1.0.* -t "$BPM_WORKDIR"/output_libgoa/usr/share/vala/vapi/ + _pick libgoa usr/include/goa-1.0/goa + _pick libgoa usr/lib/libgoa-1.0.so* + _pick libgoa usr/lib/girepository-1.0/Goa-1.0.typelib + _pick libgoa usr/lib/goa-1.0/include + _pick libgoa usr/lib/pkgconfig/goa-1.0.pc + _pick libgoa usr/share/gir-1.0/Goa-1.0.gir + _pick libgoa usr/share/vala/vapi/goa-1.0.* + _pick libgoa usr/share/doc # Install package license install -Dm644 "$BPM_SOURCE"/COPYING "$BPM_OUTPUT"/usr/share/licenses/gnome-online-accounts/COPYING