Accepting request 1173955 from devel:microos:aeon

- Handle changelog properly, to work with reproducible builds
  in Factory

OBS-URL: https://build.opensuse.org/request/show/1173955
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/containment-tik-img-to-rpm?expand=0&rev=2

containment-tik-img-to-rpm

@@ -39,8 +39,9 @@ for f in ${img_dir}/*.raw.xz; do
 	-e "s@__OS_NAME__@${os_name}@g" \
 	< ${spec_in} \
 	> ${build_dir}/image.spec
-	
-	touch ${build_dir}/image.changes
+
+	cp /.build-srcdir/*.changes ${build_dir}/image.changes
+	${build_dir}/changelog2spec --target rpm --file ${build_dir}/image.changes >> ${build_dir}/image.spec
 
 	# Local builds have the file already in place, that's not true on IBS
 	if [ ! -f ${top_dir}/SOURCES/${image} ]; then

containment-tik-img-to-rpm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 14 09:49:57 UTC 2024 - Richard Brown <rbrown@suse.com>
+
+- Handle changelog properly, to work with reproducible builds
+  in Factory 
+
 -------------------------------------------------------------------
 Fri May 10 18:19:04 UTC 2024 - Richard Brown <rbrown@suse.com>
 

containment-tik-img-to-rpm.spec

@@ -15,23 +15,23 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 Name:           containment-tik-img-to-rpm
 Version:        1.0
 Release:        0
-Summary:	OBS Post check for containing tik-osimage-* images in RPM
+Summary:        OBS Post check for containing tik-osimage-* images in RPM
 License:        MIT
 Source:         containment-tik-img-to-rpm
-Source1:	image.spec.in
+Source1:        image.spec.in
 BuildRequires:  filesystem
-BuildArch:	noarch
+BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       jq
-Requires:       gawk
+Requires:       build
 Requires:       coreutils
-Conflicts:	containment-rpm
-
+Requires:       gawk
+Requires:       jq
+Requires:       perl-DateTime-Format-DateParse
+Conflicts:      containment-rpm
 
 %description
 OBS Post check for containing tik-osimage-* images in RPM
@@ -52,4 +52,3 @@ install -m 644 %{SOURCE1} %{buildroot}/usr/lib/build/
 %{_prefix}/lib/build/image.spec.in
 
 %changelog
-