- revert the switch to tar_scm which dropped the signature

validation
- reinstanciate keyring from Lasse
- go back to the last release signed by Lasse (5.4.2)
- revert multibuild, drop service and rpmlintrc
- revert version number messup

OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=160

_multibuild

@@ -1,3 +0,0 @@
-<multibuild>
-  <package>lang</package>
-</multibuild>

_service

@@ -1,15 +0,0 @@
-<services>
-  <!-- use tar_scm instead of obs_scm as obs_scm drags in too many dependencies into Ring0 -->
-  <service name="tar_scm" mode="manual">
-    <param name="url">https://git.tukaani.org/xz.git</param>
-    <param name="scm">git</param>
-    <param name="revision">v5.4.6</param>
-    <param name="versionformat">@PARENT_TAG@</param>
-    <param name="changesgenerate">enable</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-  </service>
-  <service name="recompress" mode="manual">
-    <param name="file">*.tar</param>
-    <param name="compression">zst</param>
-  </service>
-</services>

_servicedata

@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">https://git.tukaani.org/xz.git</param>
-              <param name="changesrevision">6e8732c5a317a349986a4078718f1d95b67072c5</param></service></servicedata>

xz-5.4.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87947679abcf77cc509d8d1b474218fd16b72281e2797360e909deaee1ac9d05
+size 2799022

xz-5.4.6.tar.zst

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:efbbd1d2917dd3b1b8e7c691ad287f96792b87c6888efc28482c06dc6e5044e5
-size 907627

xz.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 12 16:22:12 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- revert the switch to tar_scm which dropped the signature
+  validation
+- reinstanciate keyring from Lasse
+- go back to the last release signed by Lasse (5.4.2)
+- revert multibuild, drop service and rpmlintrc
+- revert version number messup
+
 -------------------------------------------------------------------
 Thu Apr  4 07:16:46 UTC 2024 - Dan Čermák <dcermak@suse.com>
 

xz.keyring

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+888/gToe5kb8qYwy
+=6rZC
+-----END PGP PUBLIC KEY BLOCK-----

xz.spec

@@ -15,18 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "lang"
-%global with_lang 1
-# no dash is intentional to prevent name clashes with -lang subpackage
-%global psuffix lang
-%else
-%global with_lang 0
-%global psuffix %{nil}
-%endif
 
-
-# avoid bootstrapping problem
 %if 0%{?suse_version} == 1500
 %bcond_without static
 %else
@@ -34,38 +23,26 @@
 %endif
 %define _binary_payload w9.bzdio
 
-%global real_ver 5.4.6
+%global real_ver 5.4.2
 
-Name:           xz%{psuffix}
+Name:           xz
 Version:        5.6.1.revertto5.4
 Release:        0
 Summary:        A Program for Compressing Files with the Lempel–Ziv–Markov algorithm
 License:        0BSD AND GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Archiving/Compression
 URL:            https://tukaani.org/xz/
-Source0:        xz-%{real_ver}.tar.zst
+Source0:        https://github.com/tukaani-project/xz/releases/download/v%{real_ver}/xz-%{real_ver}.tar.gz
-Source1:        xznew
+Source1:        https://github.com/tukaani-project/xz/releases/download/v%{real_ver}/xz-%{real_ver}.tar.gz.sig
-Source2:        xznew.1
+Source2:        baselibs.conf
-Source3:        xz-rpmlintrc
+Source3:        https://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring
-Source4:        baselibs.conf
+Source4:        xznew
+Source5:        xznew.1
+Source8:        xz-rpmlintrc
+Source9:        baselibs.conf
 BuildRequires:  pkgconfig
-BuildRequires:  zstd
+Provides:       lzma = %{version}
-# for autoreconf
+Obsoletes:      lzma < %{version}
-BuildRequires:  autoconf
-BuildRequires:  automake
-# required by autoconf for autopoint
-BuildRequires:  gettext-tools
-# needed by autopoint
-BuildRequires:  findutils
-BuildRequires:  libtool
-%if %{with_lang}
-# required to update manpage translations
-BuildRequires:  po4a
-BuildArch:      noarch
-%endif
-
-Provides:       lzma = %{real_ver}
-Obsoletes:      lzma < %{real_ver}
 %{?suse_build_hwcaps_libs}
 
 %description
@@ -81,15 +58,13 @@ The xz command is a program for compressing files.
   decompressing speed.
 * Very similar command line interface to what gzip and bzip2 have.
 
-%if %{with_lang}
+
-%{lang_package -n xz}
+%lang_package
-%else
 
 %package -n liblzma5
 Summary:        Lempel–Ziv–Markov chain algorithm compression library
 License:        0BSD
 Group:          System/Libraries
-Provides:       liblzma5 = %{real_ver}
 
 %description -n liblzma5
 Library for encoding/decoding LZMA files.
@@ -98,11 +73,11 @@ Library for encoding/decoding LZMA files.
 Summary:        Development package for the LZMA library
 License:        0BSD
 Group:          Development/Libraries/C and C++
-Requires:       liblzma5 = %{real_ver}
+Requires:       liblzma5 = %{version}
-Provides:       lzma-devel = %{real_ver}
+Provides:       lzma-devel = %{version}
-Obsoletes:      lzma-devel < %{real_ver}
+Obsoletes:      lzma-devel < %{version}
-Provides:       lzma-alpha-devel = %{real_ver}
+Provides:       lzma-alpha-devel = %{version}
-Obsoletes:      lzma-alpha-devel < %{real_ver}
+Obsoletes:      lzma-alpha-devel < %{version}
 
 %description devel
 This package contains the header files and libraries needed for
@@ -113,15 +88,12 @@ compiling programs using the LZMA library.
 Summary:        Static version of LZMA library
 License:        SUSE-Public-Domain
 Group:          Development/Libraries/C and C++
-Requires:       lzma-devel = %{real_ver}
+Requires:       xz-devel = %{version}
 
 %description static-devel
 Static library for the LZMA library
 %endif
 
-# without lang
-%endif
-
 %prep
 %autosetup -n xz-%{real_ver}
 
@@ -130,8 +102,6 @@ Static library for the LZMA library
 export CFLAGS="%{optflags} -D_REENTRANT -pipe -fPIE"
 export LDFLAGS="-Wl,-z,relro,-z,now -pie"
 
-autoreconf -fi
-
 # Either we build it without pic enabled, or we build one at a time
 %if %{with static}
 %configure \
@@ -155,11 +125,6 @@ cp ./src/liblzma/.libs/liblzma.a liblzma.a
   %make_build
 %endif
 
-%if %{with_lang}
-# update manpage translations
-./po4a/update-po
-%endif
-
 %check
 %make_build check
 
@@ -167,39 +132,15 @@ cp ./src/liblzma/.libs/liblzma.a liblzma.a
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name} --all-name --with-man
-install -Dpm 0755 %{SOURCE1} %{buildroot}%{_bindir}/xznew
+install -Dpm 0755 %{SOURCE4} %{buildroot}%{_bindir}/xznew
-install -Dpm 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/xznew.1
+install -Dpm 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/xznew.1
 %if %{with static}
 install -Dpm 0644 liblzma.a %{buildroot}%{_libdir}/
 %endif
 rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2}
 
-%if ! %{with_lang}
 %post -n liblzma5 -p /sbin/ldconfig
 %postun -n liblzma5 -p /sbin/ldconfig
-%endif
-
-%if %{with_lang}
-%files -n xz-lang -f %{name}.lang
-# exclude everything of the other packages
-%exclude %_docdir
-%exclude %_bindir
-%exclude %_mandir/man1
-%exclude %{_includedir}
-%exclude %{_libdir}
-%exclude /usr/src/debug/
-%exclude /usr/lib/debug/
-
-%dir %{_mandir}/fr
-%dir %{_mandir}/de
-%dir %{_mandir}/ko
-%if 0%{?suse_version} == 1500
-%dir %{_mandir}/ro
-%dir %{_mandir}/uk
-%endif
-
-# with_lang
-%else
 
 %files
 %license COPYING COPYING.GPLv2
@@ -253,13 +194,14 @@ rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2}
 %{_mandir}/man1/xzmore.1%{?ext_man}
 %{_mandir}/man1/xznew.1%{?ext_man}
 
-# covered by -lang subpackage
+%files lang -f %{name}.lang
-%exclude %{_mandir}/fr
+%dir %{_mandir}/fr
-%exclude %{_mandir}/de
+%dir %{_mandir}/de
-%exclude %{_mandir}/ko
+%dir %{_mandir}/ko
-%exclude %{_mandir}/ro
+%if 0%{?suse_version} == 1500
-%exclude %{_mandir}/uk
+%dir %{_mandir}/ro
-%exclude /usr/share/locale
+%dir %{_mandir}/uk
+%endif
 
 %files -n liblzma5
 %{_libdir}/liblzma.so.5*
@@ -277,7 +219,4 @@ rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2}
 %{_libdir}/liblzma.a
 %endif
 
-# with_lang end
-%endif
-
 %changelog