Ticket #5875: tap2rpm-hestern.patch

tap2rpm.py

@@ -35 +35 @@
 [ -r /etc/default/%(rpm_file)s ] && . /etc/default/%(rpm_file)s
 
 #  check for required files
-if [ ! -x /usr/bin/twistd ]
+if [ ! -x %(twistd) ]
 then
-        echo "$0: Aborting, no /usr/bin/twistd found"
+        echo "$0: Aborting, no %(twistd) found"
         exit 0
 fi
 if [ ! -r "$file" ]
@@ -95 +95 @@
 Group:      Networking/Daemons
 Source:     %(tarfile_basename)s
 BuildRoot:  %%{_tmppath}/%%{name}-%%{version}-root
-Requires:   /usr/bin/twistd
+Requires:   %(twistd)
 BuildArch:  noarch
 
 %%description
@@ -237 +237 @@
 
     tapFileBase = os.path.basename(config['tapfile'])
 
+    twistdPath = os.path.join(os.path.dirname(sys.argv[0]), 'twistd')
+
     initFileInfo = tarfile.TarInfo(
             os.path.join(
                 config['release-name'],
@@ -248 +250 @@
     initFileRealData = initFileData % {
             'tap_file': tapFileBase,
             'rpm_file': config['release-name'],
+            'twistd': twistdPath,
             'twistd_option': config['twistd_option'],
         }
     initFileInfo.size = len(initFileRealData)
@@ -279 +282 @@
             'date': time.strftime('%a %b %d %Y', time.localtime(time.time())),
             'maintainer': config['maintainer'],
             'long_description': config['long_description'],
+            'twistd': twistdPath,
         }
     specHandle.write(specFileRealData)
     specHandle.close()