.gitignore

@@ -1 +0,0 @@
-.osc

containment-tik-img-to-rpm

@@ -39,8 +39,8 @@ for f in ${img_dir}/*.raw.xz; do
 	-e "s@__OS_NAME__@${os_name}@g" \
 	< ${spec_in} \
 	> ${build_dir}/image.spec
-	
-	cp /.build-changelog ${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

containment-tik-img-to-rpm.changes

@@ -1,13 +1,3 @@
--------------------------------------------------------------------
-Tue Jul  2 14:02:02 UTC 2024 - Richard Brown <rbrown@suse.com>
-
-- Package uncompressed images, to be used with systemd-repart
-
--------------------------------------------------------------------
-Thu Jun 20 15:13:08 UTC 2024 - Richard Brown <rbrown@suse.com>
-
-- Adjust for new obs-build changelog location 
-
 -------------------------------------------------------------------
 Tue May 14 09:49:57 UTC 2024 - Richard Brown <rbrown@suse.com>
 

image.spec.in

@@ -15,19 +15,18 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 This package contains the __OS_NAME__ image for tik.
 
 %prep
-xz -k -d %{SOURCE0}
 
 %build
 
 %install
 install -d -m 644 $RPM_BUILD_ROOT%{_prefix}/lib/tik/img
-install -p -D -m 644 %{_sourcedir}/%(basename %{SOURCE0} .xz) $RPM_BUILD_ROOT%{_prefix}/lib/tik/img/%{name}.%{version}.raw
+install -p -D -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{_prefix}/lib/tik/img/%{name}.%{version}.raw.xz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%{_prefix}/lib/tik/img/%{name}.%{version}.raw
+%{_prefix}/lib/tik/img/%{name}.%{version}.raw.xz
 
 %changelog