Update package version to 255.22

check-version.sh

@@ -6,10 +6,7 @@ REPO="elogind/elogind"
 # Get tag name using Github Rest API
 TAG_NAME=$(curl -s -L -H "X-GitHub-Api-Version: 2022-11-28" -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/"$REPO"/releases/latest | jq -r '.tag_name')
 
-# Get version number from tag name
+# Trim 'v' character in TAG_NAME variable
-VERSION=$(echo "$TAG_NAME" | rev | cut -d'-' -f1 | rev)
+VERSION=$(echo "$TAG_NAME" | tr -d 'V')
-
-# Trim 'v' character in VERSION variable
-VERSION=$(echo "$VERSION" | tr -d 'v')
 
 echo "$VERSION"

pkg.info

@@ -1,30 +1,48 @@
 name: elogind
 description: The systemd project's 'logind', extracted to a standalone package
-version: "255.17"
+version: "255.22"
-revision: 3
+revision: 1
 url: https://github.com/elogind/elogind
 license: GPL2-only,LGPL2.1-only
 architecture: any
 type: source
-depends:
-  - acl
-  - dbus
-  - gcc-libs
-  - glibc
-  - libcap
-  - pam
-  - udev
-  - util-linux
 optional_depends:
   - polkit
 make_depends:
+  - acl
+  - dbus
   - docbook-xsl-nons
   - gperf
   - intltool
   - meson
+  - pam
   - python-jinja
+  - udev
+  - util-linux
 downloads:
-  - url: https://github.com/elogind/elogind/archive/v${BPM_PKG_VERSION}/elogind-${BPM_PKG_VERSION}.tar.gz
+  - url: https://github.com/elogind/elogind/archive/refs/tags/V${BPM_PKG_VERSION}.tar.gz
     extract_to: ${BPM_SOURCE}
     extract_strip_components: 1
-    checksum: a9725ae3f73f8d910de84c108bc11bfd4c782bef6a4190b2ec70c5d2f22344db
+    checksum: 79b5eb96bccf3a6101b35e62d0f80b2d0a47077a1507a6edc705f8cb7bdb0619
+split_packages:
+  - name: elogind
+    keep:
+      - etc/elogind/logind.conf
+      - etc/elogind/sleep.conf
+      - etc/elogind/logind.conf.d/10-elogind.conf
+      - etc/elogind/sleep.conf.d/10-elogind.conf
+    depends:
+      - acl
+      - dbus
+      - libelogind
+      - pam
+      - udev
+      - util-linux
+  - name: libelogind
+    description: Elogind client libraries
+    license: LGPL2.1-only
+    depends:
+      - gcc-libs
+      - glibc
+      - libcap
+      - libudev

source.sh

@@ -28,14 +28,29 @@ check() {
   meson test -C build $test_list
 }
 
+_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() {
+package_elogind() {
   meson install -C build --destdir="$BPM_OUTPUT"
 
-  # Create symlink for systemd compatibility
+  cd "$BPM_OUTPUT"
-  mkdir "$BPM_OUTPUT"/usr/include/systemd/
+  
-  ln -sfn elogind "$BPM_OUTPUT"/usr/include/systemd/elogind
+  # Move client library files into split package
+  _pick libelogind usr/lib/libelogind*.so*
+  _pick libelogind usr/lib/pkgconfig
+  _pick libelogind usr/include
+  _pick libelogind usr/share/man/man3
 
   # Install pam module
   install -Dm644 "$BPM_WORKDIR"/elogind-user "$BPM_OUTPUT"/etc/pam.d/elogind-user
@@ -44,5 +59,10 @@ package() {
   install -Dm644 "$BPM_WORKDIR"/elogind.esv "$BPM_OUTPUT"/etc/esvm/services/elogind.esv
 
   # Install package license
-  install -Dm644 "$BPM_SOURCE"/LICENSE.{GPL2,LGPL2.1} -t "$BPM_OUTPUT"/usr/share/licenses/elogind/elogind
+  install -Dm644 "$BPM_SOURCE"/LICENSE.{GPL2,LGPL2.1} -t "$BPM_OUTPUT"/usr/share/licenses/elogind
+}
+
+package_libelogind() {
+  # Install package license
+  install -Dm644 "$BPM_SOURCE"/LICENSE.LGPL2.1 -t "$BPM_OUTPUT"/usr/share/licenses/libelogind
 }