From 194b789044882b857d6e83a57bab547027a73c4c39498e0e6acf542694a6a56b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 28 Mar 2024 14:17:23 +0000 Subject: [PATCH 1/9] Updating link to change in openSUSE:Factory/xz revision 89 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=f0e651633b665b1bd51c792b12798a48 --- xz.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xz.spec b/xz.spec index ac1735d..6330c41 100644 --- a/xz.spec +++ b/xz.spec @@ -60,6 +60,7 @@ The xz command is a program for compressing files. Summary: Lempel–Ziv–Markov chain algorithm compression library License: 0BSD Group: System/Libraries +Provides: liblzma5 = 5.4.6 %description -n liblzma5 Library for encoding/decoding LZMA files. From 3f14a8b2e3d4678d6dc4afbefe4097cf1a1d0c506b3fb08d8f07846a8307c61d Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Thu, 4 Apr 2024 07:56:08 +0000 Subject: [PATCH 2/9] Accepting request 1164499 from home:dancermak:branches:Base:System Bump epoch to 1 and restore a sane version number OBS-URL: https://build.opensuse.org/request/show/1164499 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=156 --- xz.changes | 5 +++++ xz.spec | 27 ++++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/xz.changes b/xz.changes index 41cc3d6..23bd3e8 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 4 07:16:46 UTC 2024 - Dan Čermák + +- Bump epoch to 1 and restore a sane version number + ------------------------------------------------------------------- Thu Mar 28 13:51:05 UTC 2024 - Dirk Müller diff --git a/xz.spec b/xz.spec index 6330c41..0f43e7b 100644 --- a/xz.spec +++ b/xz.spec @@ -24,21 +24,22 @@ %endif %define _binary_payload w9.bzdio Name: xz -Version: 5.6.1.revertto5.4 +Version: 5.4.6 +Epoch: 1 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/v5.4.6/xz-5.4.6.tar.gz -Source1: https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.gz.sig +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 Source2: baselibs.conf Source3: https://tukaani.org/misc/jia_tan_pubkey.txt#/%{name}.keyring Source4: xznew Source5: xznew.1 BuildRequires: pkgconfig -Provides: lzma = 5.4.6 -Obsoletes: lzma < 5.4.6 +Provides: lzma = %{version} +Obsoletes: lzma < %{version} %{?suse_build_hwcaps_libs} %description @@ -60,7 +61,7 @@ The xz command is a program for compressing files. Summary: Lempel–Ziv–Markov chain algorithm compression library License: 0BSD Group: System/Libraries -Provides: liblzma5 = 5.4.6 +Provides: liblzma5 = %{version} %description -n liblzma5 Library for encoding/decoding LZMA files. @@ -69,11 +70,11 @@ Library for encoding/decoding LZMA files. Summary: Development package for the LZMA library License: 0BSD Group: Development/Libraries/C and C++ -Requires: liblzma5 = 5.4.6 -Provides: lzma-devel = 5.4.6 -Obsoletes: lzma-devel < 5.4.6 -Provides: lzma-alpha-devel = 5.4.6 -Obsoletes: lzma-alpha-devel < 5.4.6 +Requires: liblzma5 = %{version} +Provides: lzma-devel = %{version} +Obsoletes: lzma-devel < %{version} +Provides: lzma-alpha-devel = %{version} +Obsoletes: lzma-alpha-devel < %{version} %description devel This package contains the header files and libraries needed for @@ -84,14 +85,14 @@ 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 = 5.4.6 +Requires: lzma-devel = %{version} %description static-devel Static library for the LZMA library %endif %prep -%autosetup -n xz-5.4.6 +%autosetup %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects From 6e6c8a9fd47ca1b874bd7fab9f13258d88a972fa4f4de8b55a06e4ef3b319bb1 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Thu, 4 Apr 2024 12:23:38 +0000 Subject: [PATCH 3/9] Accepting request 1164582 from home:dancermak:branches:Base:System Revert Epoch, introduce multibuild and switch to using tar_scm for fetching the sources OBS-URL: https://build.opensuse.org/request/show/1164582 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=157 --- _multibuild | 3 ++ _service | 16 ++++++++ _servicedata | 4 ++ xz-5.4.6.tar.gz | 3 -- xz-5.4.6.tar.gz.sig | Bin 566 -> 0 bytes xz-5.4.6.tar.zst | 3 ++ xz.changes | 5 ++- xz.keyring | 52 ------------------------- xz.spec | 92 ++++++++++++++++++++++++++++++++++++-------- 9 files changed, 107 insertions(+), 71 deletions(-) create mode 100644 _multibuild create mode 100644 _service create mode 100644 _servicedata delete mode 100644 xz-5.4.6.tar.gz delete mode 100644 xz-5.4.6.tar.gz.sig create mode 100644 xz-5.4.6.tar.zst delete mode 100644 xz.keyring 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 2ff5950e9d042ea0eb06d89aee73d61c817964c8f864cfe5af81e537fd3f0a43..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j*8)MfIt!E=B+AjaNV{PG9>r}RYy0%fzDGyn<-5Lx{4 z2mYt@MNNed`vv`Sl=TfB;V8bEvLC|HwbHpkIH{SsE~2Ofkny^m0H)&1q!gN`^%|Tl zc_rVkl;iWG9EGDYwKdr+V%&+;(}Hhc4o^SSi?Xr3J#ar0kczRc-zd~beD01i=5q;T zb8b71>6qmOZC0^sK>MBAkdmdL3E<53gDw>*c(zS1lG0Y?XMc%i3V4&d>MzDAPJ{AK zVJr`AsErK_%&X6BS);SM=Sm!^b@+JwVeK1rg*2Ruk=m6)9A3HY>*#-b5twfLxkTAW??{M&%&W@|qM}O{_jN>TAz9VOPCPBc7$9Q5qs?sTjJ{(YN!w&<%lo`&*8cq1g@cFFtbU>4Fm8g3+J;6PVWg5mxGOt}5e0V3Xg93KpF9Kj%p)|NUcy}jEWzdCa~ntpMrnXgr*jEYPMI@mY+ zeSu@M$iW^h)~ne^;hOKX7&9pW$hA4<3DfhLkfFwf?%dB{k-2Fxmy9Uf+yomrBZW#0 Eoa+r8hX4Qo 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 From 02fb01d80fe8fa2c97a4077d5fc74e0d02aa33f26dab3d912224354a42340455 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Thu, 4 Apr 2024 14:51:12 +0000 Subject: [PATCH 4/9] Accepting request 1164597 from home:dancermak:branches:Base:System - switch to obs_scm - don't abuse %bcond for multibuild - add rpmlintrc for dubious rpmlint warning - add a package suffix for the multibuild lang flavor OBS-URL: https://build.opensuse.org/request/show/1164597 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=158 --- _service | 9 ++++----- xz-5.4.6.obscpio | 3 +++ xz-5.4.6.tar.zst | 3 --- xz-rpmlintrc | 4 ++++ xz.changes | 1 + xz.obsinfo | 4 ++++ xz.spec | 47 +++++++++++++++++++++++++---------------------- 7 files changed, 41 insertions(+), 30 deletions(-) create mode 100644 xz-5.4.6.obscpio delete mode 100644 xz-5.4.6.tar.zst create mode 100644 xz-rpmlintrc create mode 100644 xz.obsinfo diff --git a/_service b/_service index 0e08d7f..212c6b6 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + https://git.tukaani.org/xz.git git v5.4.6 @@ -7,10 +7,9 @@ enable v(.*) - - - + + *.tar - zstd + zst diff --git a/xz-5.4.6.obscpio b/xz-5.4.6.obscpio new file mode 100644 index 0000000..583d622 --- /dev/null +++ b/xz-5.4.6.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31f8f522274b3c530492c0309d1b51b8a9a999efc72201282601b82ec799635b +size 5001740 diff --git a/xz-5.4.6.tar.zst b/xz-5.4.6.tar.zst deleted file mode 100644 index cb42470..0000000 --- a/xz-5.4.6.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efbbd1d2917dd3b1b8e7c691ad287f96792b87c6888efc28482c06dc6e5044e5 -size 907627 diff --git a/xz-rpmlintrc b/xz-rpmlintrc new file mode 100644 index 0000000..e792495 --- /dev/null +++ b/xz-rpmlintrc @@ -0,0 +1,4 @@ +# rpmlint freaks out because we declare the lang multibuild as noarch and +# %_libdir is archspecific, but we either exclude %_libdir or it's in the part +# belonging to the archfull build +addFilter("libdir-macro-in-noarch-package.*%{_libdir}") diff --git a/xz.changes b/xz.changes index 54e4f9e..39d612d 100644 --- a/xz.changes +++ b/xz.changes @@ -5,6 +5,7 @@ Thu Apr 4 07:16:46 UTC 2024 - Dan Čermák tarballs on github are gone - introduce _multibuild to allow building the translations outside of Ring0 and everything else in Ring0 +- add rpmlintrc to silence harmless warnings ------------------------------------------------------------------- Thu Mar 28 13:51:05 UTC 2024 - Dirk Müller diff --git a/xz.obsinfo b/xz.obsinfo new file mode 100644 index 0000000..e793666 --- /dev/null +++ b/xz.obsinfo @@ -0,0 +1,4 @@ +name: xz +version: 5.4.6 +mtime: 1706269280 +commit: 6e8732c5a317a349986a4078718f1d95b67072c5 diff --git a/xz.spec b/xz.spec index a69b653..7296b72 100644 --- a/xz.spec +++ b/xz.spec @@ -17,9 +17,11 @@ %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "lang" -%bcond_without lang +%global with_lang 1 +%global psuffix -lang %else -%bcond_with lang +%global with_lang 0 +%global psuffix %{nil} %endif @@ -33,17 +35,18 @@ %global real_ver 5.4.6 -Name: xz +Name: xz%{psuffix} 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: %{name}-%{real_ver}.tar.zst -Source2: baselibs.conf -Source4: xznew -Source5: xznew.1 +Source0: xz-%{real_ver}.tar.zst +Source1: xznew +Source2: xznew.1 +Source3: xz-rpmlintrc +Source4: baselibs.conf BuildRequires: pkgconfig BuildRequires: zstd # for autoreconf @@ -54,7 +57,7 @@ BuildRequires: gettext-tools # needed by autopoint BuildRequires: findutils BuildRequires: libtool -%if %{with lang} +%if %{with_lang} # required to update manpage translations BuildRequires: po4a BuildArch: noarch @@ -77,9 +80,8 @@ 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 - +%if %{with_lang} +%{lang_package -n xz} %else %package -n liblzma5 @@ -120,7 +122,7 @@ Static library for the LZMA library %endif %prep -%autosetup -n %{name}-%{real_ver} +%autosetup -n xz-%{real_ver} %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects @@ -152,7 +154,7 @@ cp ./src/liblzma/.libs/liblzma.a liblzma.a %make_build %endif -%if %{with lang} +%if %{with_lang} # update manpage translations ./po4a/update-po %endif @@ -164,26 +166,26 @@ 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 %{SOURCE4} %{buildroot}%{_bindir}/xznew -install -Dpm 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/xznew.1 +install -Dpm 0755 %{SOURCE1} %{buildroot}%{_bindir}/xznew +install -Dpm 0644 %{SOURCE2} %{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 %{without lang} +%if ! %{with_lang} %post -n liblzma5 -p /sbin/ldconfig %postun -n liblzma5 -p /sbin/ldconfig %endif -%if %{with lang} -%files lang -f %{name}.lang +%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 %{_libdir} %exclude /usr/src/debug/ %exclude /usr/lib/debug/ @@ -194,9 +196,10 @@ rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2} %dir %{_mandir}/ro %dir %{_mandir}/uk %endif -%endif -%if %{without lang} +# with_lang +%else + %files %license COPYING COPYING.GPLv2 %{_docdir}/%{name} @@ -273,7 +276,7 @@ rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2} %{_libdir}/liblzma.a %endif -# without lang end +# with_lang end %endif %changelog From c6659041f79ad8b4d87c4a458785188dc5c9ad24132e3e14087dfc146631a98c Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Wed, 10 Apr 2024 13:05:09 +0000 Subject: [PATCH 5/9] Accepting request 1164991 from home:dancermak:branches:Base:System switch back to tar_scm to not add deps into Ring0 OBS-URL: https://build.opensuse.org/request/show/1164991 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=159 --- _service | 6 +++--- xz-5.4.6.obscpio | 3 --- xz-5.4.6.tar.zst | 3 +++ xz.obsinfo | 4 ---- xz.spec | 3 ++- 5 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 xz-5.4.6.obscpio create mode 100644 xz-5.4.6.tar.zst delete mode 100644 xz.obsinfo diff --git a/_service b/_service index 212c6b6..c7c03ce 100644 --- a/_service +++ b/_service @@ -1,5 +1,6 @@ - + + https://git.tukaani.org/xz.git git v5.4.6 @@ -7,8 +8,7 @@ enable v(.*) - - + *.tar zst diff --git a/xz-5.4.6.obscpio b/xz-5.4.6.obscpio deleted file mode 100644 index 583d622..0000000 --- a/xz-5.4.6.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31f8f522274b3c530492c0309d1b51b8a9a999efc72201282601b82ec799635b -size 5001740 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.obsinfo b/xz.obsinfo deleted file mode 100644 index e793666..0000000 --- a/xz.obsinfo +++ /dev/null @@ -1,4 +0,0 @@ -name: xz -version: 5.4.6 -mtime: 1706269280 -commit: 6e8732c5a317a349986a4078718f1d95b67072c5 diff --git a/xz.spec b/xz.spec index 7296b72..0a876a7 100644 --- a/xz.spec +++ b/xz.spec @@ -18,7 +18,8 @@ %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "lang" %global with_lang 1 -%global psuffix -lang +# no dash is intentional to prevent name clashes with -lang subpackage +%global psuffix lang %else %global with_lang 0 %global psuffix %{nil} From 45d7b2f00706492965d2d9f06f27abb1dd98cd3b53f48d7b1dbbe4eeb9fd7984 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 12 Apr 2024 16:23:56 +0000 Subject: [PATCH 6/9] - 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 | 3 -- _service | 15 ------ _servicedata | 4 -- xz-5.4.2.tar.gz | 3 ++ xz-5.4.2.tar.gz.sig | Bin 0 -> 566 bytes xz-5.4.6.tar.zst | 3 -- xz.changes | 10 ++++ xz.keyring | 52 +++++++++++++++++++ xz.spec | 121 +++++++++++--------------------------------- 9 files changed, 95 insertions(+), 116 deletions(-) delete mode 100644 _multibuild delete mode 100644 _service delete mode 100644 _servicedata create mode 100644 xz-5.4.2.tar.gz create mode 100644 xz-5.4.2.tar.gz.sig delete mode 100644 xz-5.4.6.tar.zst create mode 100644 xz.keyring diff --git a/_multibuild b/_multibuild deleted file mode 100644 index 339c630..0000000 --- a/_multibuild +++ /dev/null @@ -1,3 +0,0 @@ - - lang - diff --git a/_service b/_service deleted file mode 100644 index c7c03ce..0000000 --- a/_service +++ /dev/null @@ -1,15 +0,0 @@ - - - - https://git.tukaani.org/xz.git - git - v5.4.6 - @PARENT_TAG@ - enable - v(.*) - - - *.tar - zst - - diff --git a/_servicedata b/_servicedata deleted file mode 100644 index 8f785ff..0000000 --- a/_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - https://git.tukaani.org/xz.git - 6e8732c5a317a349986a4078718f1d95b67072c5 \ No newline at end of file diff --git a/xz-5.4.2.tar.gz b/xz-5.4.2.tar.gz new file mode 100644 index 0000000..c3b69b7 --- /dev/null +++ b/xz-5.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87947679abcf77cc509d8d1b474218fd16b72281e2797360e909deaee1ac9d05 +size 2799022 diff --git a/xz-5.4.2.tar.gz.sig b/xz-5.4.2.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..7876e927bd8c0a347b916bf841e7e4acb5a202e66a1552bd31b193d37bc858f4 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j*SkitODQM6|bFs&Ro?sa`>7)Brk0%R5CP5=rC5IF92 zeQ6j*AbZ{q|4z8BPxQ9l=?ie84$gtwNjGHtc7#xq9?tQL6SyPkL(11cxRYXb#Rj>% zf@0%E66FIUH4kZW_j>weKPH-cZFum{#-Q^EmB=TPA87sKKVkifaW z1}(CfGE@O0HjVTor%jA5_|nzi{pd7y%DvWViwd;LjJF{iIds}V4jd2Jg5swssAWl zW7N2*B+eOu1;oC|iL#eKD1EOQuOPuKhdi9Qh@NwZatn&f`tI>h+kNp!Snzg1VV`hn z(|_4l7dR+tn*?iHawG0=U1XApI%9X%j8LuTHvOlGE+^Y$=uE0usy&e!2X4Ya_mi)) z=}Ry|fk`fm6clQn$*`_?!23%(Y?8>p! EpEw^4;{X5v literal 0 HcmV?d00001 diff --git a/xz-5.4.6.tar.zst b/xz-5.4.6.tar.zst deleted file mode 100644 index cb42470..0000000 --- a/xz-5.4.6.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efbbd1d2917dd3b1b8e7c691ad287f96792b87c6888efc28482c06dc6e5044e5 -size 907627 diff --git a/xz.changes b/xz.changes index 39d612d..997f041 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Apr 12 16:22:12 UTC 2024 - Dirk Müller + +- 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 diff --git a/xz.keyring b/xz.keyring new file mode 100644 index 0000000..c62c840 --- /dev/null +++ b/xz.keyring @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +888/gToe5kb8qYwy +=6rZC +-----END PGP PUBLIC KEY BLOCK----- diff --git a/xz.spec b/xz.spec index 0a876a7..d7c1b52 100644 --- a/xz.spec +++ b/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 -Source1: xznew -Source2: xznew.1 -Source3: xz-rpmlintrc -Source4: baselibs.conf +Source0: https://github.com/tukaani-project/xz/releases/download/v%{real_ver}/xz-%{real_ver}.tar.gz +Source1: https://github.com/tukaani-project/xz/releases/download/v%{real_ver}/xz-%{real_ver}.tar.gz.sig +Source2: baselibs.conf +Source3: https://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring +Source4: xznew +Source5: xznew.1 +Source8: xz-rpmlintrc +Source9: baselibs.conf BuildRequires: pkgconfig -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} +Provides: lzma = %{version} +Obsoletes: lzma < %{version} %{?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} -%else + +%lang_package %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} -Provides: lzma-devel = %{real_ver} -Obsoletes: lzma-devel < %{real_ver} -Provides: lzma-alpha-devel = %{real_ver} -Obsoletes: lzma-alpha-devel < %{real_ver} +Requires: liblzma5 = %{version} +Provides: lzma-devel = %{version} +Obsoletes: lzma-devel < %{version} +Provides: lzma-alpha-devel = %{version} +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 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/xznew.1 +install -Dpm 0755 %{SOURCE4} %{buildroot}%{_bindir}/xznew +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 -%exclude %{_mandir}/fr -%exclude %{_mandir}/de -%exclude %{_mandir}/ko -%exclude %{_mandir}/ro -%exclude %{_mandir}/uk -%exclude /usr/share/locale +%files lang -f %{name}.lang +%dir %{_mandir}/fr +%dir %{_mandir}/de +%dir %{_mandir}/ko +%if 0%{?suse_version} == 1500 +%dir %{_mandir}/ro +%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 From 473780abd481fc953d73f069efff2a68545992af6d2ab3a0b525c993f8c1bc79 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 12 Apr 2024 16:24:48 +0000 Subject: [PATCH 7/9] - remove payload setting, we are using zstd now OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=161 --- xz.changes | 1 + xz.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xz.changes b/xz.changes index 997f041..fdfa272 100644 --- a/xz.changes +++ b/xz.changes @@ -7,6 +7,7 @@ Fri Apr 12 16:22:12 UTC 2024 - Dirk Müller - go back to the last release signed by Lasse (5.4.2) - revert multibuild, drop service and rpmlintrc - revert version number messup +- remove payload setting, we are using zstd now ------------------------------------------------------------------- Thu Apr 4 07:16:46 UTC 2024 - Dan Čermák diff --git a/xz.spec b/xz.spec index d7c1b52..8468537 100644 --- a/xz.spec +++ b/xz.spec @@ -16,12 +16,12 @@ # +# avoid bootstrapping problem %if 0%{?suse_version} == 1500 %bcond_without static %else %bcond_with static %endif -%define _binary_payload w9.bzdio %global real_ver 5.4.2 From 970e38531308a6e23addf742e66c9382cc1134e66e169954ecf9b543d770a1c9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 12 Apr 2024 16:26:08 +0000 Subject: [PATCH 8/9] - switch back to tarballs because the upstream tarballs are not gone OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=162 --- xz.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xz.changes b/xz.changes index fdfa272..4d21baa 100644 --- a/xz.changes +++ b/xz.changes @@ -3,6 +3,8 @@ Fri Apr 12 16:22:12 UTC 2024 - Dirk Müller - revert the switch to tar_scm which dropped the signature validation +- switch back to tarballs because the upstream tarballs are not + gone - reinstanciate keyring from Lasse - go back to the last release signed by Lasse (5.4.2) - revert multibuild, drop service and rpmlintrc From 08a869d68c3e8d747b8396610394ca62f6378bdcff5842c51db46683aea2a75f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 13 Apr 2024 07:27:08 +0000 Subject: [PATCH 9/9] - use real_ver for the Source, move everything else back to %version like before the hectic XZ downgrade OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=163 --- xz-rpmlintrc | 4 ---- xz.changes | 3 ++- xz.spec | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 xz-rpmlintrc diff --git a/xz-rpmlintrc b/xz-rpmlintrc deleted file mode 100644 index e792495..0000000 --- a/xz-rpmlintrc +++ /dev/null @@ -1,4 +0,0 @@ -# rpmlint freaks out because we declare the lang multibuild as noarch and -# %_libdir is archspecific, but we either exclude %_libdir or it's in the part -# belonging to the archfull build -addFilter("libdir-macro-in-noarch-package.*%{_libdir}") diff --git a/xz.changes b/xz.changes index 4d21baa..8a06f28 100644 --- a/xz.changes +++ b/xz.changes @@ -8,7 +8,8 @@ Fri Apr 12 16:22:12 UTC 2024 - Dirk Müller - 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 +- use real_ver for the Source, move everything else back to + %version like before the hectic XZ downgrade - remove payload setting, we are using zstd now ------------------------------------------------------------------- diff --git a/xz.spec b/xz.spec index 8468537..3c30e74 100644 --- a/xz.spec +++ b/xz.spec @@ -38,8 +38,6 @@ Source2: baselibs.conf Source3: https://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring Source4: xznew Source5: xznew.1 -Source8: xz-rpmlintrc -Source9: baselibs.conf BuildRequires: pkgconfig Provides: lzma = %{version} Obsoletes: lzma < %{version}