diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..339c630 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + lang + diff --git a/_service b/_service new file mode 100644 index 0000000..0e08d7f --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + https://git.tukaani.org/xz.git + git + v5.4.6 + @PARENT_TAG@ + enable + v(.*) + + + + + *.tar + zstd + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..8f785ff --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://git.tukaani.org/xz.git + 6e8732c5a317a349986a4078718f1d95b67072c5 \ No newline at end of file diff --git a/xz-5.4.6.tar.gz b/xz-5.4.6.tar.gz deleted file mode 100644 index d2111e9..0000000 --- a/xz-5.4.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aeba3e03bf8140ddedf62a0a367158340520f6b384f75ca6045ccc6c0d43fd5c -size 2889306 diff --git a/xz-5.4.6.tar.gz.sig b/xz-5.4.6.tar.gz.sig deleted file mode 100644 index 2ff5950..0000000 Binary files a/xz-5.4.6.tar.gz.sig and /dev/null differ diff --git a/xz-5.4.6.tar.zst b/xz-5.4.6.tar.zst new file mode 100644 index 0000000..cb42470 --- /dev/null +++ b/xz-5.4.6.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efbbd1d2917dd3b1b8e7c691ad287f96792b87c6888efc28482c06dc6e5044e5 +size 907627 diff --git a/xz.changes b/xz.changes index 23bd3e8..54e4f9e 100644 --- a/xz.changes +++ b/xz.changes @@ -1,7 +1,10 @@ ------------------------------------------------------------------- Thu Apr 4 07:16:46 UTC 2024 - Dan Čermák -- Bump epoch to 1 and restore a sane version number +- Switch to using tar_scm for fetching the sources as the upstream + tarballs on github are gone +- introduce _multibuild to allow building the translations outside + of Ring0 and everything else in Ring0 ------------------------------------------------------------------- Thu Mar 28 13:51:05 UTC 2024 - Dirk Müller diff --git a/xz.keyring b/xz.keyring deleted file mode 100644 index 597d039..0000000 --- a/xz.keyring +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -aK5MKg== -=d3XT ------END PGP PUBLIC KEY BLOCK----- diff --git a/xz.spec b/xz.spec index 0f43e7b..a69b653 100644 --- a/xz.spec +++ b/xz.spec @@ -15,6 +15,13 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "lang" +%bcond_without lang +%else +%bcond_with lang +%endif + # avoid bootstrapping problem %if 0%{?suse_version} == 1500 @@ -23,23 +30,38 @@ %bcond_with static %endif %define _binary_payload w9.bzdio + +%global real_ver 5.4.6 + Name: xz -Version: 5.4.6 -Epoch: 1 +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: https://github.com/tukaani-project/xz/releases/download/v%{version}/xz-%{version}.tar.gz -Source1: https://github.com/tukaani-project/xz/releases/download/v%{version}/xz-%{version}.tar.gz.sig +Source0: %{name}-%{real_ver}.tar.zst Source2: baselibs.conf -Source3: https://tukaani.org/misc/jia_tan_pubkey.txt#/%{name}.keyring Source4: xznew Source5: xznew.1 BuildRequires: pkgconfig -Provides: lzma = %{version} -Obsoletes: lzma < %{version} +BuildRequires: zstd +# for autoreconf +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 @@ -55,13 +77,16 @@ 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 +%else + %package -n liblzma5 Summary: Lempel–Ziv–Markov chain algorithm compression library License: 0BSD Group: System/Libraries -Provides: liblzma5 = %{version} +Provides: liblzma5 = %{real_ver} %description -n liblzma5 Library for encoding/decoding LZMA files. @@ -70,11 +95,11 @@ Library for encoding/decoding LZMA files. Summary: Development package for the LZMA library License: 0BSD Group: Development/Libraries/C and C++ -Requires: liblzma5 = %{version} -Provides: lzma-devel = %{version} -Obsoletes: lzma-devel < %{version} -Provides: lzma-alpha-devel = %{version} -Obsoletes: lzma-alpha-devel < %{version} +Requires: liblzma5 = %{real_ver} +Provides: lzma-devel = %{real_ver} +Obsoletes: lzma-devel < %{real_ver} +Provides: lzma-alpha-devel = %{real_ver} +Obsoletes: lzma-alpha-devel < %{real_ver} %description devel This package contains the header files and libraries needed for @@ -85,25 +110,32 @@ 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 = %{version} +Requires: lzma-devel = %{real_ver} %description static-devel Static library for the LZMA library %endif +# without lang +%endif + %prep -%autosetup +%autosetup -n %{name}-%{real_ver} %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects 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 \ --with-pic \ --docdir=%{_docdir}/%{name} \ --disable-shared CONFIG_SHELL=/bin/sh + %make_build cp ./src/liblzma/.libs/liblzma.a liblzma.a %endif @@ -120,6 +152,11 @@ 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 @@ -134,10 +171,22 @@ install -Dpm 0644 liblzma.a %{buildroot}%{_libdir}/ %endif rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2} +%if %{without lang} %post -n liblzma5 -p /sbin/ldconfig %postun -n liblzma5 -p /sbin/ldconfig +%endif +%if %{with lang} %files 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 @@ -145,7 +194,9 @@ rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2} %dir %{_mandir}/ro %dir %{_mandir}/uk %endif +%endif +%if %{without lang} %files %license COPYING COPYING.GPLv2 %{_docdir}/%{name} @@ -198,6 +249,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 +%exclude %{_mandir}/fr +%exclude %{_mandir}/de +%exclude %{_mandir}/ko +%exclude %{_mandir}/ro +%exclude %{_mandir}/uk +%exclude /usr/share/locale + %files -n liblzma5 %{_libdir}/liblzma.so.5* @@ -214,4 +273,7 @@ rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2} %{_libdir}/liblzma.a %endif +# without lang end +%endif + %changelog