Add support for Fedora 36

Author: qzed

.github/workflows/release.yml

@@ -78,6 +78,64 @@ jobs:
         name: debian-latest
         path: release
 
+  build-f36:
+    name: Build Fedora 36 package
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:36
+      options: --security-opt seccomp=unconfined
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Install build dependencies
+      run: |
+        dnf distro-sync -y
+        dnf install -y make rpmdevtools rpm-sign 'dnf-command(builddep)'
+        dnf builddep -y pkg/fedora/libwacom-surface.spec
+
+    - name: Build package
+      run: |
+        cd pkg/fedora
+
+        # Build the .rpm packages
+        ./makerpm
+
+    - name: Sign packages
+      env:
+        GPG_KEY_ID: 56C464BAAC421453
+        GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
+      run: |
+        cd pkg/fedora/out
+
+        # import GPG key
+        echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
+
+        # sign package
+        cd noarch
+        rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
+
+        cd ..
+
+        cd x86_64
+        rpm --resign *.rpm --define "_gpg_name $GPG_KEY_ID"
+
+    - name: Prepare artifacts
+      run: |
+        cd pkg/fedora
+        mkdir release
+
+        cp out/noarch/* release/
+        cp out/x86_64/* release/
+
+        rm release/libwacom-surface-devel-*
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: fedora-36-latest
+        path: pkg/fedora/release
+
   build-f35:
     name: Build Fedora 35 package
     runs-on: ubuntu-latest
@@ -194,14 +252,19 @@ jobs:
 
   release:
     name: Publish release
-    needs: [build-deb, build-f35, build-f34]
+    needs: [build-deb, build-f36, build-f35, build-f34]
     runs-on: ubuntu-latest
     steps:
     - name: Download Debian artifacts
       uses: actions/download-artifact@v1
       with:
         name: debian-latest
 
+    - name: Download Fedora 36 artifacts
+      uses: actions/download-artifact@v1
+      with:
+        name: fedora-36-latest
+
     - name: Download Fedora 35 artifacts
       uses: actions/download-artifact@v1
       with:
@@ -272,6 +335,58 @@ jobs:
         git commit -m "Update Debian libwacom"
         git push --set-upstream origin "${update_branch}"
 
+  repo-f36:
+    name: Update Fedora 36 package repository
+    needs: [release]
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:36
+      options: --security-opt seccomp=unconfined
+    steps:
+    - name: Install dependencies
+      run: |
+        dnf install -y git findutils
+
+    - name: Download artifacts
+      uses: actions/download-artifact@v1
+      with:
+        name: fedora-36-latest
+
+    - name: Update repository
+      env:
+        SURFACEBOT_TOKEN: ${{ secrets.GITHUB_BOT_TOKEN }}
+        BRANCH_STAGING: u/staging
+        GIT_REF: ${{ github.ref }}
+      run: |
+        repo="https://surfacebot:${SURFACEBOT_TOKEN}@github.com/linux-surface/repo.git"
+
+        # clone package repository
+        git clone -b "${BRANCH_STAGING}" "${repo}" repo
+
+        # copy packages
+        cp fedora-36-latest/* repo/fedora/f36
+        cd repo/fedora/f36
+
+        # parse git tag from ref
+        GIT_TAG=$(echo $GIT_REF | sed 's|^refs/tags/||g')
+
+        # convert packages into references
+        for pkg in $(find . -name '*.rpm'); do
+          echo "libwacom-surface:$GIT_TAG/$(basename $pkg)" > $pkg.blob
+          rm $pkg
+        done
+
+        # set git identity
+        git config --global user.email "[email protected]"
+        git config --global user.name "surfacebot"
+
+        # commit and push
+        update_branch="${BRANCH_STAGING}-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
+        git checkout -b "${update_branch}"
+        git add .
+        git commit -m "Update Fedora 36 libwacom"
+        git push --set-upstream origin "${update_branch}"
+
   repo-f35:
     name: Update Fedora 35 package repository
     needs: [release]

pkg/fedora/libwacom-surface

@@ -1 +1 @@
-../../patches/v1
+../../patches

pkg/fedora/libwacom-surface.spec

@@ -1,8 +1,13 @@
 %global debug_package %{nil}
 
 Name:           libwacom-surface
+%if %{fedora} >= 36
+Version:        2.2.0
+Release:        1%{?dist}
+%else
 Version:        1.12.1
 Release:        4%{?dist}
+%endif
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
 Provides:       libwacom
@@ -11,7 +16,11 @@ Conflicts:      libwacom
 License:        MIT
 URL:            https://github.com/linuxwacom/libwacom
 
+%if %{fedora} >= 36
+Source0:        https://github.com/linuxwacom/libwacom/releases/download/libwacom-%{version}/libwacom-%{version}.tar.xz
+%else
 Source0:        https://github.com/linuxwacom/libwacom/releases/download/libwacom-%{version}/libwacom-%{version}.tar.bz2
+%endif
 
 BuildRequires:  meson gcc
 BuildRequires:  glib2-devel libgudev1-devel
@@ -47,11 +56,15 @@ Tablet information client library data files.
 
 %prep
 %autosetup -S git -n libwacom-%{version}
-ls -l ../
-ls -l ../../../
-for p in ../libwacom-surface/*.patch; do
+%if %{fedora} >= 36
+for p in ../libwacom-surface/v2/*.patch; do
   patch -p1 < "${p}"
 done
+%else
+for p in ../libwacom-surface/v1/*.patch; do
+  patch -p1 < "${p}"
+done
+%endif
 git add . && git commit -q --author 'rpm-build <rpm-build>' -m 'libwacom-surface-%{version} base'
 
 %build
@@ -97,6 +110,9 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 %{_datadir}/libwacom/layouts/*.svg
 
 %changelog
+* Thu Apr 28 2022 Maximilian Luz <[email protected]> - 2.2.0-1
+- Add support for libwacom-2.x
+
 * Mon Jan 17 2022 Peter Hutterer <[email protected]> - 1.12.1-1
 - libwacom 1.12.1