diff --git a/tiff.changes b/tiff.changes index d1eea4c..76249bb 100644 --- a/tiff.changes +++ b/tiff.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Nov 12 14:40:24 UTC 2024 - Marcus Rueckert + +- make doc packages noarch. no need to have those per arch +- ensure that the src rpms are named per build flavor: + You might now ask why. Good question: + + 1. the spec file during the build get patched. `@BUILD_FLAVOR@` + gets replaced with the value. which means the src rpm between + build flavor builds is not identical. Also the last built + src.rpm will be published. with different content and runtime + requires (aka our BuildRequires). + + 2. for historical reasons the internal dependency tracking goes + via the src.rpm package. So without having differently named + src.rpms the build cycle we were trying to solve was not + actually solved. So we append a suffix to the Name attribute + in the preamble now. + ------------------------------------------------------------------- Mon Nov 11 17:34:34 UTC 2024 - Marcus Rueckert diff --git a/tiff.spec b/tiff.spec index 4674986..f1ea8f9 100644 --- a/tiff.spec +++ b/tiff.spec @@ -26,8 +26,13 @@ %define asan_build 0 %define debug_build 0 +%define pkg_name tiff +%if "%{build_flavor}" == "" Name: tiff +%else +Name: tiff-%{build_flavor} +%endif Version: 4.7.0 Release: 0 Summary: Tools for Converting from and to the Tagged Image File Format @@ -87,6 +92,7 @@ the libtiff library. Summary: Development Tools for Programs which will use the libtiff Library Group: Productivity/Graphics/Convertors Requires: tiff = %{version} +BuildArch: noarch %description -n tiff-docs This package contains the header files and static libraries for @@ -99,6 +105,7 @@ This package holds the man pages for the command lint tools. Summary: Development Documentation for Programs which will use the libtiff Library Group: Development/Libraries/C and C++ Requires: libtiff-devel = %{version} +BuildArch: noarch %description -n libtiff-devel-docs This package contains the header files and static libraries for @@ -109,7 +116,7 @@ This package holds the development man pages. %endif %prep -%autosetup -p1 +%autosetup -p1 -n %{pkg_name}-%{version} %build CFLAGS="%{optflags} -fPIC"