From 5b8edb13d84a8ea8ef248c5e95bcab714eaabe18 Mon Sep 17 00:00:00 2001 From: purian23 Date: Fri, 12 Dec 2025 15:42:21 -0500 Subject: [PATCH] distro: OBS updates --- .github/workflows/run-obs.yml | 33 +++++++++++++++++++++++++++++- distro/debian/dms/_service | 6 +++--- distro/debian/dms/debian/changelog | 7 +++++++ distro/debian/dms/debian/rules | 24 +++++++++++----------- distro/opensuse/dms.spec | 6 +++++- 5 files changed, 59 insertions(+), 17 deletions(-) diff --git a/.github/workflows/run-obs.yml b/.github/workflows/run-obs.yml index 632069d5..6f046ac3 100644 --- a/.github/workflows/run-obs.yml +++ b/.github/workflows/run-obs.yml @@ -215,13 +215,44 @@ jobs: # Update openSUSE dms spec (stable only) sed -i "s/^Version:.*/Version: $VERSION_NO_V/" distro/opensuse/dms.spec - # Update Debian _service files + # Update openSUSE spec changelog + DATE_STR=$(date "+%a %b %d %Y") + CHANGELOG_ENTRY="* $DATE_STR AvengeMedia - ${VERSION_NO_V}-1\\n- Update to stable $VERSION release\\n- Bug fixes and improvements" + sed -i "/%changelog/a\\$CHANGELOG_ENTRY\\n" distro/opensuse/dms.spec + + # Update Debian _service files (both tar_scm and download_url formats) for service in distro/debian/*/_service; do if [[ -f "$service" ]]; then + # Update tar_scm revision parameter (for dms-git) sed -i "s|v[0-9.]*|$VERSION|" "$service" + + # Update download_url paths (for dms stable) + sed -i "s|/v[0-9.]\+/|/$VERSION/|g" "$service" + sed -i "s|/tags/v[0-9.]\+\.tar\.gz|/tags/$VERSION.tar.gz|g" "$service" fi done + # Update Debian changelog for dms stable + if [[ -f "distro/debian/dms/debian/changelog" ]]; then + CHANGELOG_DATE=$(date -R) + TEMP_CHANGELOG=$(mktemp) + + cat > "$TEMP_CHANGELOG" << EOF + dms ($VERSION_NO_V) stable; urgency=medium + + * Update to $VERSION stable release + * Bug fixes and improvements + + -- Avenge Media $CHANGELOG_DATE + + EOF + + cat "distro/debian/dms/debian/changelog" >> "$TEMP_CHANGELOG" + mv "$TEMP_CHANGELOG" "distro/debian/dms/debian/changelog" + + echo "✓ Updated Debian changelog to $VERSION_NO_V" + fi + - name: Install Go uses: actions/setup-go@v5 with: diff --git a/distro/debian/dms/_service b/distro/debian/dms/_service index e295c1cf..872004d4 100644 --- a/distro/debian/dms/_service +++ b/distro/debian/dms/_service @@ -3,19 +3,19 @@ https github.com - /AvengeMedia/DankMaterialShell/archive/refs/tags/v1.0.0.tar.gz + /AvengeMedia/DankMaterialShell/archive/refs/tags/v1.0.2.tar.gz dms-source.tar.gz https github.com - /AvengeMedia/DankMaterialShell/releases/download/v1.0.0/dms-distropkg-amd64.gz + /AvengeMedia/DankMaterialShell/releases/download/v1.0.2/dms-distropkg-amd64.gz https github.com - /AvengeMedia/DankMaterialShell/releases/download/v1.0.0/dms-distropkg-arm64.gz + /AvengeMedia/DankMaterialShell/releases/download/v1.0.2/dms-distropkg-arm64.gz diff --git a/distro/debian/dms/debian/changelog b/distro/debian/dms/debian/changelog index ffff8ac9..f0326dac 100644 --- a/distro/debian/dms/debian/changelog +++ b/distro/debian/dms/debian/changelog @@ -1,3 +1,10 @@ +dms (1.0.2) stable; urgency=medium + + * Update to v1.0.2 stable release + * Bug fixes and improvements + + -- Avenge Media Thu, 12 Dec 2025 14:30:00 -0500 + dms (1.0.0) stable; urgency=medium * Update to v1.0.0 release diff --git a/distro/debian/dms/debian/rules b/distro/debian/dms/debian/rules index 9455d503..cebd1197 100755 --- a/distro/debian/dms/debian/rules +++ b/distro/debian/dms/debian/rules @@ -36,17 +36,19 @@ override_dh_auto_build: fi chmod +x dms + # Extract source if needed if [ ! -d DankMaterialShell-$(UPSTREAM_VERSION) ]; then \ if [ -f ../SOURCES/dms-source.tar.gz ]; then \ tar -xzf ../SOURCES/dms-source.tar.gz; \ elif [ -f dms-source.tar.gz ]; then \ tar -xzf dms-source.tar.gz; \ fi; \ - SOURCE_DIR=$$(find . -maxdepth 1 -type d -name "DankMaterialShell-*" ! -name "DankMaterialShell-$(UPSTREAM_VERSION)" | head -n1); \ - if [ -n "$$SOURCE_DIR" ] && [ "$$SOURCE_DIR" != "./DankMaterialShell-$(UPSTREAM_VERSION)" ]; then \ - echo "Renaming $$SOURCE_DIR to DankMaterialShell-$(UPSTREAM_VERSION)"; \ - mv "$$SOURCE_DIR" DankMaterialShell-$(UPSTREAM_VERSION); \ - fi; \ + fi + # Rename directory to match expected version + SOURCE_DIR=$$(find . -maxdepth 1 -type d -name "DankMaterialShell-*" ! -name "DankMaterialShell-$(UPSTREAM_VERSION)" | head -n1); \ + if [ -n "$$SOURCE_DIR" ]; then \ + echo "Renaming $$SOURCE_DIR to DankMaterialShell-$(UPSTREAM_VERSION)"; \ + mv "$$SOURCE_DIR" DankMaterialShell-$(UPSTREAM_VERSION); \ fi @@ -54,13 +56,11 @@ override_dh_auto_install: install -Dm755 dms debian/dms/usr/bin/dms mkdir -p debian/dms/usr/share/quickshell/dms debian/dms/usr/lib/systemd/user - # Handle directory name mismatch again for install step if needed - if [ ! -d DankMaterialShell-$(UPSTREAM_VERSION) ]; then \ - SOURCE_DIR=$$(find . -maxdepth 1 -type d -name "DankMaterialShell-*" | head -n1); \ - if [ -n "$$SOURCE_DIR" ]; then \ - echo "Renaming $$SOURCE_DIR to DankMaterialShell-$(UPSTREAM_VERSION) for install"; \ - mv "$$SOURCE_DIR" DankMaterialShell-$(UPSTREAM_VERSION); \ - fi; \ + # Ensure directory has correct version name for install step + SOURCE_DIR=$$(find . -maxdepth 1 -type d -name "DankMaterialShell-*" ! -name "DankMaterialShell-$(UPSTREAM_VERSION)" | head -n1); \ + if [ -n "$$SOURCE_DIR" ]; then \ + echo "Renaming $$SOURCE_DIR to DankMaterialShell-$(UPSTREAM_VERSION) for install"; \ + mv "$$SOURCE_DIR" DankMaterialShell-$(UPSTREAM_VERSION); \ fi if [ -d DankMaterialShell-$(UPSTREAM_VERSION) ]; then \ cp -r DankMaterialShell-$(UPSTREAM_VERSION)/quickshell/* debian/dms/usr/share/quickshell/dms/; \ diff --git a/distro/opensuse/dms.spec b/distro/opensuse/dms.spec index 8b3648b5..b0039dd6 100644 --- a/distro/opensuse/dms.spec +++ b/distro/opensuse/dms.spec @@ -3,7 +3,7 @@ %global debug_package %{nil} Name: dms -Version: 1.0.0 +Version: 1.0.2 Release: 1%{?dist} Summary: DankMaterialShell - Material 3 inspired shell for Wayland compositors @@ -105,6 +105,10 @@ pkill -USR1 -x dms >/dev/null 2>&1 || : %{_datadir}/icons/hicolor/scalable/apps/danklogo.svg %changelog +* Fri Dec 12 2025 AvengeMedia - 1.0.2-1 +- Update to stable v1.0.2 release +- Bug fixes and improvements + * Fri Nov 22 2025 AvengeMedia - 0.6.2-1 - Stable release build with pre-built binaries - Multi-arch support (x86_64, aarch64)