dracut.spec: add support for builds without dist-tag

In the module-build-service, we have pieces of dracut provided by different
modules ("base-runtime" provides most functionality, but we need
dracut-network in "installer". Since these two modules build with separate
dist-tags, we need to reduce this strict requirement to ignore the dist-tag.

diff --git a/dracut.spec b/dracut.spec
index f6502c654196adb96079fca11aec8e5567800859..855adba64581b607213eb8e21ca3f139c62a1926 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -14,9 +14,11 @@
 %define with_nbd 0
 %endif
 
+%define dist_free_release xxx
+
 Name: dracut
 Version: xxx
-Release: xxx
+Release: %{dist_free_release}%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -136,7 +138,15 @@ NFS, iSCSI, NBD, FCoE with the dracut-network package.
 
 %package network
 Summary: dracut modules to build a dracut initramfs with network support
+%if 0%{?_module_build}
+# In the module-build-service, we have pieces of dracut provided by different
+# modules ("base-runtime" provides most functionality, but we need
+# dracut-network in "installer". Since these two modules build with separate
+# dist-tags, we need to reduce this strict requirement to ignore the dist-tag.
+Requires: %{name} >= %{version}-%{dist_free_release}
+%else
 Requires: %{name} = %{version}-%{release}
+%endif
 Requires: iputils
 Requires: iproute
 Requires: dhclient
@@ -184,7 +194,12 @@ initramfs with dracut, which drops capabilities.
 
 %package live
 Summary: dracut modules to build a dracut initramfs with live image capabilities
+%if 0%{?_module_build}
+# See the network subpackage comment.
+Requires: %{name} >= %{version}-%{dist_free_release}
+%else
 Requires: %{name} = %{version}-%{release}
+%endif
 Requires: %{name}-network = %{version}-%{release}
 Requires: tar gzip coreutils bash device-mapper curl
 

diff --git a/git2spec.pl b/git2spec.pl
index 4b03a95cf5f07d199c9537e287a51a099619e34c..0c5f3b9e43111852ac04454a309c2fb4bb03ac07 100755 (executable)
--- a/git2spec.pl
+++ b/git2spec.pl
@@ -39,8 +39,8 @@ while(<>) {
     if (/^Version:/) {
        print "Version: $tag\n";
     }
-    elsif (/^Release:/) {
-       print "Release: $release%{?dist}\n";
+    elsif (/^%define dist_free_release/) {
+       print "%define dist_free_release $release\n";
     }
     elsif ((/^Source0:/) || (/^Source:/)) {
        print $_;