- use xz compression instead of bzip2 for source tar

diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml
index 4282d2d1f718762e6c6209feb17870f02791387d..80b62274dd639b832cdefe56f029e07bbe5f9b9b 100644 (file)
--- 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 397b2263d3aa515a90354b59a240d3041d8617b9..bac4d76fb598f0ab416c84b76059224c37da39d5 100644 (file)
--- 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 0e18385b2023efa8c8a6579b031b7e398a9578c9..8b6d264e7fd96d68e2eaf6140da9c5b5f264ed58 100644 (file)
--- 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 3ad00a2b831ca0d1c2250c7194690e263f773138..ac622843eb8d344130bfe2c529b20063972eb05f 100644 (file)
--- 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 f539bbedc1f39d59c25a4e3ac5561e6e033c9416..0295b036701c5b478875ee00176cd85ec5826b92 100644 (file)
--- 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 f1abff17852664e4ba8da14f29e0d6bcc5592ade..9fe474650e8beb27ebbdcbee5ef770b07052be8e 100644 (file)
--- 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 7cb196bc236a0127566e20ef32986705d9ef9205..d87ccbe1809bc10cb197fcbede04c4a08c1b8eec 100644 (file)
--- 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
   <https://ftp.suse.com/pub/projects/snapper/>.
 
 - When the documentation changes e.g. the man page or an important

diff --git a/package/.gitignore b/package/.gitignore
index 31ba2f3cc902b57e8249381f97a27e131f6e5ab5..4514384d4b0f38b46449870bfd154334d524d0a8 100644 (file)
--- 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 9bc8a20dddae60d66a2a8cd833ba02be470adb9f..04a673464e319ef5d741357e8f743a52792ae03d 100644 (file)
--- 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 0a0024aa68d546330b970c297c72380971aac4cf..bedcac12eb0527fd5688af76f018d740cf2cc32b 100644 (file)
--- 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