split spec file, move img_tempdir to it's own spec

Signed-off-by: Douglas Schilling Landgraf <[email protected]>

Author: dougsland

Makefile

@@ -13,6 +13,7 @@ SPECFILE_SUBPACKAGE_VIDEO=rpm/video/video.spec
 SPECFILE_SUBPACKAGE_TTY7=rpm/tty7/tty7.spec
 SPECFILE_SUBPACKAGE_INPUT=rpm/input/input.spec
 SPECFILE_SUBPACKAGE_TTYUSB0=rpm/ttyUSB0/ttyUSB0.spec
+SPECFILE_SUBPACKAGE_IMG_TEMPDIR=rpm/img_tempdir/img_tempdir.spec
 SPECFILE_SUBPACKAGE_ROS2_ROLLING=rpm/ros2/rolling/ros2_rolling.spec
 RPM_TOPDIR ?= $(PWD)/rpmbuild
 VERSION ?= $(shell cat VERSION)
@@ -161,6 +162,16 @@ ttyUSB0_subpackage: clean dist ##             - Creates a local RPM package, use
 		--define="version ${VERSION}" \
 		${SPECFILE_SUBPACKAGE_TTYUSB0}
 
+.PHONY: img_tempdir_subpackage
+img_tempdir_subpackage: clean dist ##             - Creates a local RPM package, useful for development
+	mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
+	tools/version-update -v ${VERSION}
+	cp ./rpm/v${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
+	rpmbuild -ba \
+		--define="_topdir ${RPM_TOPDIR}" \
+		--define="version ${VERSION}" \
+		${SPECFILE_SUBPACKAGE_IMG_TEMPDIR}
+
 # ostree target is a helper for everything required for ostree
 .PHONY: ostree
 ostree: qm_dropin_img_tempdir ##             - A helper for creating QM packages for ostree based distros

rpm/img_tempdir/img_tempdir.spec

@@ -0,0 +1,30 @@
+Name: qm-dropin-img-tempdir
+Version: 0.6.8
+Release: 1%{?dist}
+Summary: Drop-in configuration for QM nested containers using img tempdir
+License: GPL-2.0-only
+URL: https://github.com/containers/qm
+Source0: %{url}/archive/v%{version}.tar.gz
+BuildArch: noarch
+
+Requires: qm = %{version}-%{release}
+
+%description
+This sub-package installs drop-in configurations for QM nested containers that use img tempdir.
+
+%prep
+%autosetup -Sgit -n qm-%{version}
+
+%install
+install -d %{buildroot}%{_sysconfdir}/qm/containers/containers.conf.d
+install -m 644 etc/qm/containers/containers.conf.d/qm_dropin_img_tempdir.conf \
+    %{buildroot}%{_sysconfdir}/qm/containers/containers.conf.d/
+
+%files
+%license LICENSE
+%doc README.md
+%{_sysconfdir}/qm/containers/containers.conf.d/qm_dropin_img_tempdir.conf
+
+%changelog
+* Fri Jul 21 2023 RH Container Bot <[email protected]>
+- Added img_tempdir mount bind drop-in configuration.

rpm/qm.spec

@@ -7,12 +7,6 @@
 # Define the feature flag: 1 to enable, 0 to disable
 # By default it's disabled: 0
 
-###########################################
-# subpackage QM - img_tempdir             #
-###########################################
-# use img temp dir as /var/tmp
-%define enable_qm_dropin_img_tempdir 0
-
 ###########################################
 # subpackage QM - Enable Window Manager   #
 ###########################################
@@ -157,17 +151,6 @@ install -d %{buildroot}%{_sysconfdir}/containers/containers.conf.d
 ################# END QM Window Manager ############################
 ####################################################################
 
-########################################################
-# START - qm dropin sub-package - img tempdir          #
-########################################################
-%if %{enable_qm_dropin_img_tempdir}
-    install -m 644 %{_builddir}/qm-%{version}/etc/qm/containers/containers.conf.d/qm_dropin_img_tempdir.conf \
-        %{buildroot}%{_sysconfdir}/qm/containers/containers.conf.d/qm_dropin_img_tempdir.conf
-%endif
-########################################################
-# END - qm dropin sub-package - img tempdir            #
-########################################################
-
 # install policy modules
 %_format MODULES $x.pp.bz2
 %{__make} DESTDIR=%{buildroot} DATADIR=%{_datadir} install
@@ -224,24 +207,6 @@ fi
 %ghost %dir %{_installscriptdir}/rootfs
 %ghost %{_installscriptdir}/rootfs/*
 
-#######################################
-# sub-package QM Img TempDir          #
-#######################################
-%if %{enable_qm_dropin_img_tempdir}
-%package -n qm-dropin-img-tempdir
-Summary: Drop-in configuration for QM nested containers to img tempdir
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description -n qm-dropin-img-tempdir
-This sub-package installs a drop-in configurations for the QM.
-It creates the `/etc/qm/containers/containers.conf.d/` directory for adding
-additional drop-in configurations.
-
-%files -n qm-dropin-img-tempdir
-%{_sysconfdir}/qm/containers/containers.conf.d/qm_dropin_img_tempdir.conf
-%endif
-
 #######################################
 # sub-package qm window manager       #
 #######################################

tools/version-update

@@ -63,6 +63,7 @@ sed -i "s/Version: ${PREV_VERSION}$/Version: ${VERSION}/g" "${BASEDIR}/rpm/video
 sed -i "s/Version: ${PREV_VERSION}$/Version: ${VERSION}/g" "${BASEDIR}/rpm/tty7/tty7.spec"
 sed -i "s/Version: ${PREV_VERSION}$/Version: ${VERSION}/g" "${BASEDIR}/rpm/input/input.spec"
 sed -i "s/Version: ${PREV_VERSION}$/Version: ${VERSION}/g" "${BASEDIR}/rpm/ttyUSB0/ttyUSB0.spec"
+sed -i "s/Version: ${PREV_VERSION}$/Version: ${VERSION}/g" "${BASEDIR}/rpm/img_tempdir/img_tempdir.spec"
 # Otherwise, set the new version.
 sed -i "s/Version: 0$/Version: ${VERSION}/g" "${BASEDIR}/rpm/qm.spec"
 sed -i "s/Version: 0$/Version: ${VERSION}/g" "${BASEDIR}/rpm/kvm/qm-kvm.spec"
@@ -71,7 +72,7 @@ sed -i "s/Version: 0$/Version: ${VERSION}/g" "${BASEDIR}/rpm/sound/sound.spec"
 sed -i "s/Version: 0$/Version: ${VERSION}/g" "${BASEDIR}/rpm/video/video.spec"
 sed -i "s/Version: 0$/Version: ${VERSION}/g" "${BASEDIR}/rpm/tty7/tty7.spec"
 sed -i "s/Version: 0$/Version: ${VERSION}/g" "${BASEDIR}/rpm/input/input.spec"
-sed -i "s/Version: 0$/Version: ${VERSION}/g" "${BASEDIR}/rpm/ttyUSB0/ttyUSB0.spec"
+sed -i "s/Version: 0$/Version: ${VERSION}/g" "${BASEDIR}/rpm/img_tempdir/img_tempdir.spec"
 # Execute the changes on the rest of the files.
 for file in "${FILES[@]}"; do
     sed -i "s/${PREV_VERSION}/${VERSION}/g" "${BASEDIR}/${file}"