From a9876dc33fc03725791e1b9b8d6ec7395209f490 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Fri, 31 Mar 2023 09:18:21 +0200 Subject: [PATCH] - use xz compression instead of bzip2 for source tar --- .github/workflows/ci-debian.yml | 2 +- .github/workflows/ci-fedora.yml | 2 +- .github/workflows/ci-leap.yml | 2 +- .github/workflows/ci-tumbleweed.yml | 2 +- .github/workflows/ci-ubuntu.yml | 2 +- Makefile.am | 10 +++++----- README.md | 2 +- package/.gitignore | 2 +- package/snapper.changes | 6 ++++++ snapper.spec.in | 2 +- 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml index 4282d2d1..80b62274 100644 --- a/.github/workflows/ci-debian.yml +++ b/.github/workflows/ci-debian.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Install additional packages - run: apt-get update && apt-get install -y --no-install-recommends acl-dev autoconf automake bzip2 docbook-xsl e2fslibs-dev g++ gettext libboost-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev locales-all make ncurses-dev xsltproc + run: apt-get update && apt-get install -y --no-install-recommends acl-dev autoconf automake docbook-xsl e2fslibs-dev g++ gettext libboost-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev locales-all make ncurses-dev xsltproc xz-utils - name: List installed packages run: apt list --installed | sort diff --git a/.github/workflows/ci-fedora.yml b/.github/workflows/ci-fedora.yml index 397b2263..bac4d76f 100644 --- a/.github/workflows/ci-fedora.yml +++ b/.github/workflows/ci-fedora.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Install additional packages - run: dnf -y install acl autoconf automake boost-devel btrfs-progs-devel bzip2 dbus-devel diffutils docbook-style-xsl e2fsprogs-devel gcc-c++ gettext glibc-langpack-de glibc-langpack-fr glibc-langpack-en json-c-devel libacl-devel libmount-devel libtool libxml2-devel libxslt make ncurses-devel pam-devel + run: dnf -y install acl autoconf automake boost-devel btrfs-progs-devel dbus-devel diffutils docbook-style-xsl e2fsprogs-devel gcc-c++ gettext glibc-langpack-de glibc-langpack-fr glibc-langpack-en json-c-devel libacl-devel libmount-devel libtool libxml2-devel libxslt make ncurses-devel pam-devel xz - name: List installed packages run: rpm -qa | sort diff --git a/.github/workflows/ci-leap.yml b/.github/workflows/ci-leap.yml index 0e18385b..8b6d264e 100644 --- a/.github/workflows/ci-leap.yml +++ b/.github/workflows/ci-leap.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Install additional packages - run: zypper --non-interactive in --no-recommends autoconf automake bzip2 dbus-1-devel docbook-xsl-stylesheets e2fsprogs-devel gcc-c++ gettext-runtime glibc-locale gzip libacl-devel libboost_system-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel + run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets e2fsprogs-devel gcc-c++ gettext-runtime glibc-locale gzip libacl-devel libboost_system-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz - name: List installed packages run: rpm -qa | sort diff --git a/.github/workflows/ci-tumbleweed.yml b/.github/workflows/ci-tumbleweed.yml index 3ad00a2b..ac622843 100644 --- a/.github/workflows/ci-tumbleweed.yml +++ b/.github/workflows/ci-tumbleweed.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Install additional packages - run: zypper --non-interactive in --no-recommends autoconf automake bzip2 dbus-1-devel docbook-xsl-stylesheets e2fsprogs-devel gcc-c++ gettext-runtime glibc-locale libacl-devel libboost_system-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libbtrfsutil-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel + run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets e2fsprogs-devel gcc-c++ gettext-runtime glibc-locale libacl-devel libboost_system-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libbtrfsutil-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz - name: List installed packages run: rpm -qa | sort diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml index f539bbed..0295b036 100644 --- a/.github/workflows/ci-ubuntu.yml +++ b/.github/workflows/ci-ubuntu.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Install additional packages - run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends acl-dev autoconf automake bzip2 docbook-xsl e2fslibs-dev g++ gettext language-pack-de language-pack-fr language-pack-en libboost-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev make ncurses-dev xsltproc + run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends acl-dev autoconf automake docbook-xsl e2fslibs-dev g++ gettext language-pack-de language-pack-fr language-pack-en libboost-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev make ncurses-dev xsltproc xz-utils - name: List installed packages run: apt list --installed | sort diff --git a/Makefile.am b/Makefile.am index f1abff17..9fe47465 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,13 +5,13 @@ SUBDIRS = snapper dbus server client scripts pam data doc po examples \ testsuite testsuite-real testsuite-cmp zypp-plugin -AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip +AUTOMAKE_OPTIONS = foreign dist-xz no-dist-gzip doc_DATA = AUTHORS COPYING EXTRA_DIST = $(doc_DATA) VERSION LIBVERSION -snapper-$(VERSION).tar.bz2: dist-bzip2 +snapper-$(VERSION).tar.xz: dist-xz DEBIAN_FLAVOURS = \ Debian_10.0 \ @@ -44,7 +44,7 @@ show-raspbian: @echo "Raspbian flavors: $(RASPBIAN_FLAVOURS)" package-clean: - rm -f package/snapper-*.tar.bz2 + rm -f package/snapper-*.tar.xz rm -f package/debian.* rm -f package/*.dsc* @@ -103,7 +103,7 @@ EXTRA_TAR_OPTIONS = --format=gnu --owner=root --group=root \ am__tar=find "$$tardir" -type f -print0 | LC_ALL=C sort -z | \ tar -c -f - $(EXTRA_TAR_OPTIONS) -package: snapper-$(VERSION).tar.bz2 package-clean +package: snapper-$(VERSION).tar.xz package-clean find dists/debian -not -name '*.in' -not -name '.*' -type f -print0 | \ LC_ALL=C sort -z | \ tar -c -f package/debian.tar --transform='s|dists/||' --show-transformed \ @@ -117,5 +117,5 @@ package: snapper-$(VERSION).tar.bz2 package-clean for FLAV in $(UBUNTU_FLAVOURS); do cp -v package/snapper-xUbuntu.dsc.in package/snapper-$${FLAV}.dsc; done for FLAV in $(RASPBIAN_FLAVOURS); do cp -v package/snapper-Raspbian.dsc.in package/snapper-$${FLAV}.dsc; done rm package/snapper*.dsc.in* - mv snapper-$(VERSION).tar.bz2 package/ + mv snapper-$(VERSION).tar.xz package/ diff --git a/README.md b/README.md index 7cb196bc..d87ccbe1 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ package to the build service. For [openSUSE:Factory][] [xdist]: https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto [Debian builds]: https://en.opensuse.org/openSUSE:Build_Service_Debian_builds -- The generated bzip2 tarball has to be also placed at +- The generated xz tarball has to be also placed at . - When the documentation changes e.g. the man page or an important diff --git a/package/.gitignore b/package/.gitignore index 31ba2f3c..4514384d 100644 --- a/package/.gitignore +++ b/package/.gitignore @@ -1,4 +1,4 @@ -snapper-*.tar.bz2 +snapper-*.tar.xz snapper.spec debian.* *.dsc diff --git a/package/snapper.changes b/package/snapper.changes index 9bc8a20d..04a67346 100644 --- a/package/snapper.changes +++ b/package/snapper.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 31 09:15:31 CEST 2023 - aschnell@suse.com + +- use xz compression instead of bzip2 for source tar + (gh#openSUSE/snapper#277) + ------------------------------------------------------------------- Tue Mar 21 08:51:05 CET 2023 - aschnell@suse.com diff --git a/snapper.spec.in b/snapper.spec.in index 0a0024aa..bedcac12 100644 --- a/snapper.spec.in +++ b/snapper.spec.in @@ -41,7 +41,7 @@ Summary: Tool for filesystem snapshot management License: GPL-2.0-only Group: System/Packages URL: http://snapper.io/ -Source: snapper-%{version}.tar.bz2 +Source: snapper-%{version}.tar.xz %if 0%{?suse_version} BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel -- 2.47.3