Merge pull request #23 from rootd/master

Update package generation

.github/workflows/main.yml

@@ -48,14 +48,18 @@ jobs:
           ninja-version: 1.10.2
       - name: Install nFPM
         run: echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | sudo tee /etc/apt/sources.list.d/goreleaser.list && sudo apt update && sudo apt install nfpm
-      - name: Prepare nFPM config
-        run: cd /home/runner/work/libfprint/libfprint && cp nfpm_sample.yaml nfpm.yaml && sed -i "s/COMMITID/$(git rev-parse --short HEAD)/g" nfpm.yaml && mkdir ./output
+      - name: Prepare nFPM DEB config
+        run: cd /home/runner/work/libfprint/libfprint && cp nfpm_deb_sample.yaml nfpm_deb.yaml && sed -i "s/COMMITID/$(git rev-parse --short HEAD)/g" nfpm_deb.yaml && mkdir ./output
+      - name: Prepare nFPM RPM config
+        run: cd /home/runner/work/libfprint/libfprint && cp nfpm_rpm_sample.yaml nfpm_rpm.yaml && sed -i "s/COMMITID/$(git rev-parse --short HEAD)/g" nfpm_rpm.yaml
+      - name: Prepare nFPM Arch config
+        run: cd /home/runner/work/libfprint/libfprint && cp nfpm_arch_sample.yaml nfpm_arch.yaml && sed -i "s/COMMITID/$(git rev-parse --short HEAD)/g" nfpm_arch.yaml
       - name: Generating DEB package
-        run: nfpm pkg --packager deb --target ./output/
+        run: nfpm pkg --packager deb --config ./nfpm_deb.yaml --target ./output/
       - name: Generating RPM package
-        run: nfpm pkg --packager rpm --target ./output/
+        run: nfpm pkg --packager rpm --config ./nfpm_rpm.yaml --target ./output/
       - name: Generating ArchLinux package
-        run: nfpm pkg --packager archlinux --target ./output/
+        run: nfpm pkg --packager archlinux --config ./nfpm_arch.yaml --target ./output/
       - uses: actions/upload-artifact@v3
         with:
           name: meson-build-artifacts

nfpm_arch_sample.yaml

@@ -0,0 +1,72 @@
+# check https://nfpm.goreleaser.com/configuration for detailed usage
+#
+name: "libfprint"
+arch: "amd64"
+platform: "linux"
+version: "1.94.4"
+prerelease: goodixtls-COMMITID
+epoch: 99999999
+section: "default"
+priority: "extra"
+replaces:
+  - libfprint
+provides:
+  - libfprint
+  - libfprint-2.so
+
+depends:
+  - libgudev
+  - libgusb
+  - nss
+  - openssl
+  - pixman
+maintainer: "Alexander Meiler <[email protected]>, Matthieu CHARETTE <[email protected]>"
+description: |
+  This is a community implemented driver for Goodix TLS devices on Linux.
+vendor: "Goodix Fingerprint Linux Development"
+homepage: "https://github.com/goodix-fp-linux-dev"
+license: "GNU LGPL 2.1"
+contents:
+  - src: ./build/libfprint/fp-enums.h
+    dst: /usr/include/libfprint-2/fp-enums.h
+
+  - src: ./build/libfprint/libfprint-2.so.2.0.0
+    dst: /usr/lib64/libfprint-2.so.2.0.0
+
+  - src: ./build/libfprint/70-libfprint-2.rules
+    dst: /usr/lib/udev/rules.d/70-libfprint-2.rules
+
+  - src: ./build/libfprint/FPrint-2.0.gir
+    dst: /usr/share/gir-1.0/FPrint-2.0.gir
+
+  - src: ./build/libfprint/FPrint-2.0.typelib
+    dst: /usr/lib64/girepository-1.0/FPrint-2.0.typelib
+
+  - src: ./libfprint/fprint.h
+    dst: /usr/include/libfprint-2/fprint.h
+
+  - src: ./libfprint/fp-context.h
+    dst: /usr/include/libfprint-2/fp-context.h
+
+  - src: ./libfprint/fp-device.h
+    dst: /usr/include/libfprint-2/fp-device.h
+
+  - src: ./libfprint/fp-image-device.h
+    dst: /usr/include/libfprint-2/fp-image-device.h
+
+  - src: ./libfprint/fp-image.h
+    dst: /usr/include/libfprint-2/fp-image.h
+
+  - src: ./libfprint/fp-print.h
+    dst: /usr/include/libfprint-2/fp-print.h
+
+  - src: ./build/meson-private/libfprint-2.pc
+    dst: /usr/lib64/pkgconfig/libfprint-2.pc
+
+  - src: /usr/lib64/libfprint-2.so.2.0.0
+    dst: /usr/lib64/libfprint-2.so.2
+    type: symlink
+
+  - src: /usr/lib64/libfprint-2.so.2.0.0
+    dst: /usr/lib64/libfprint-2.so
+    type: symlink

nfpm_deb_sample.yaml

@@ -0,0 +1,75 @@
+# check https://nfpm.goreleaser.com/configuration for detailed usage
+#
+name: "libfprint-2-2"
+arch: "amd64"
+platform: "linux"
+version: "1.94.4"
+prerelease: goodixtls-COMMITID
+epoch: 99999999
+section: "default"
+priority: "extra"
+replaces:
+  - libfprint-2-2
+  - libfprint
+provides:
+  - libfprint
+  - libfprint-2.so
+  - libfprint-2-2
+depends:
+  - libc6
+  - libglib2.0-0
+  - libgudev-1.0-0
+  - libgusb2
+  - libnss3
+  - openssl
+  - libpixman-1-0
+maintainer: "Alexander Meiler <[email protected]>, Matthieu CHARETTE <[email protected]>"
+description: |
+  This is a community implemented driver for Goodix TLS devices on Linux.
+vendor: "Goodix Fingerprint Linux Development"
+homepage: "https://github.com/goodix-fp-linux-dev"
+license: "GNU LGPL 2.1"
+contents:
+  - src: ./build/libfprint/fp-enums.h
+    dst: /usr/include/libfprint-2/fp-enums.h
+
+  - src: ./build/libfprint/libfprint-2.so.2.0.0
+    dst: /usr/lib/x86_64-linux-gnu/libfprint-2.so.2.0.0
+
+  - src: ./build/libfprint/70-libfprint-2.rules
+    dst: /usr/lib/udev/rules.d/70-libfprint-2.rules
+
+  - src: ./build/libfprint/FPrint-2.0.gir
+    dst: /usr/share/gir-1.0/FPrint-2.0.gir
+
+  - src: ./build/libfprint/FPrint-2.0.typelib
+    dst: /usr/lib/x86_64-linux-gnu/girepository-1.0/FPrint-2.0.typelib
+
+  - src: ./libfprint/fprint.h
+    dst: /usr/include/libfprint-2/fprint.h
+
+  - src: ./libfprint/fp-context.h
+    dst: /usr/include/libfprint-2/fp-context.h
+
+  - src: ./libfprint/fp-device.h
+    dst: /usr/include/libfprint-2/fp-device.h
+
+  - src: ./libfprint/fp-image-device.h
+    dst: /usr/include/libfprint-2/fp-image-device.h
+
+  - src: ./libfprint/fp-image.h
+    dst: /usr/include/libfprint-2/fp-image.h
+
+  - src: ./libfprint/fp-print.h
+    dst: /usr/include/libfprint-2/fp-print.h
+
+  - src: ./build/meson-private/libfprint-2.pc
+    dst: /usr/lib/x86_64-linux-gnu/pkgconfig/libfprint-2.pc
+
+  - src: /usr/lib/x86_64-linux-gnu/libfprint-2.so.2.0.0
+    dst: /usr/lib/x86_64-linux-gnu/libfprint-2.so.2
+    type: symlink
+
+  - src: /usr/lib/x86_64-linux-gnu/libfprint-2.so.2.0.0
+    dst: /usr/lib/x86_64-linux-gnu/libfprint-2.so
+    type: symlink

nfpm_rpm_sample.yaml

@@ -0,0 +1,74 @@
+# check https://nfpm.goreleaser.com/configuration for detailed usage
+#
+name: "libfprint"
+arch: "amd64"
+platform: "linux"
+version: "1.94.4"
+prerelease: goodixtls-COMMITID
+epoch: 99999999
+section: "default"
+priority: "extra"
+replaces:
+  - libfprint
+provides:
+  - libfprint
+  - libfprint(aarch-64)
+  - libfprint-2.so.2()(64bit)
+  - libfprint-2.so.2(LIBFPRINT_2.0.0)(64bit)
+
+depends:
+  - libgudev
+  - libgusb
+  - nss
+  - openssl
+  - pixman
+maintainer: "Alexander Meiler <[email protected]>, Matthieu CHARETTE <[email protected]>"
+description: |
+  This is a community implemented driver for Goodix TLS devices on Linux.
+vendor: "Goodix Fingerprint Linux Development"
+homepage: "https://github.com/goodix-fp-linux-dev"
+license: "GNU LGPL 2.1"
+contents:
+  - src: ./build/libfprint/fp-enums.h
+    dst: /usr/include/libfprint-2/fp-enums.h
+
+  - src: ./build/libfprint/libfprint-2.so.2.0.0
+    dst: /usr/lib64/libfprint-2.so.2.0.0
+
+  - src: ./build/libfprint/70-libfprint-2.rules
+    dst: /usr/lib/udev/rules.d/70-libfprint-2.rules
+
+  - src: ./build/libfprint/FPrint-2.0.gir
+    dst: /usr/share/gir-1.0/FPrint-2.0.gir
+
+  - src: ./build/libfprint/FPrint-2.0.typelib
+    dst: /usr/lib64/girepository-1.0/FPrint-2.0.typelib
+
+  - src: ./libfprint/fprint.h
+    dst: /usr/include/libfprint-2/fprint.h
+
+  - src: ./libfprint/fp-context.h
+    dst: /usr/include/libfprint-2/fp-context.h
+
+  - src: ./libfprint/fp-device.h
+    dst: /usr/include/libfprint-2/fp-device.h
+
+  - src: ./libfprint/fp-image-device.h
+    dst: /usr/include/libfprint-2/fp-image-device.h
+
+  - src: ./libfprint/fp-image.h
+    dst: /usr/include/libfprint-2/fp-image.h
+
+  - src: ./libfprint/fp-print.h
+    dst: /usr/include/libfprint-2/fp-print.h
+
+  - src: ./build/meson-private/libfprint-2.pc
+    dst: /usr/lib64/pkgconfig/libfprint-2.pc
+
+  - src: /usr/lib64/libfprint-2.so.2.0.0
+    dst: /usr/lib64/libfprint-2.so.2
+    type: symlink
+
+  - src: /usr/lib64/libfprint-2.so.2.0.0
+    dst: /usr/lib64/libfprint-2.so
+    type: symlink