Ticket #5875: tap2rpm-hestern.2.patch

twisted/scripts/tap2rpm.py

@@ -35 +35 @@
 [ -r /etc/default/%(rpm_file)s ] && . /etc/default/%(rpm_file)s
 
 #  check for required files
-if [ ! -x %(twistd) ]
+if [ ! -x %(twistd)s ]
 then
-        echo "$0: Aborting, no %(twistd) found"
+        echo "$0: Aborting, no %(twistd)s found"
         exit 0
 fi
 if [ ! -r "$file" ]
@@ -56 +56 @@
 case "$1" in
         start)
                 echo -n "Starting %(rpm_file)s: twistd"
-                daemon twistd  \\
+                daemon %(twistd)s  \\
                                 --pidfile=$pidfile \\
                                 --rundir=$rundir \\
                                 --%(twistd_option)s=$file \\
@@ -95 +95 @@
 Group:      Networking/Daemons
 Source:     %(tarfile_basename)s
 BuildRoot:  %%{_tmppath}/%%{name}-%%{version}-root
-Requires:   %(twistd)
+Requires:   %(twistd)s
 BuildArch:  noarch
 
 %%description