- In case of an update of package info: do never remove existing

info page from dir file (boo#1201852)

- Do lua scripting only once for execute() function 

- Check for filetrigger lua scriplets if rpm.execute() as function
  call is given and used this

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texinfo?expand=0&rev=65

texinfo.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Aug  3 08:30:34 UTC 2022 - Dr. Werner Fink <werner@suse.de>
+
+- In case of an update of package info: do never remove existing
+  info page from dir file (boo#1201852)
+
+-------------------------------------------------------------------
+Fri Jul 29 12:14:22 UTC 2022 - Dr. Werner Fink <werner@suse.de>
+
+- Do lua scripting only once for execute() function 
+
+-------------------------------------------------------------------
+Wed Jul 27 07:39:30 UTC 2022 - Dr. Werner Fink <werner@suse.de>
+
+- Check for filetrigger lua scriplets if rpm.execute() as function
+  call is given and used this
+
 -------------------------------------------------------------------
 Tue Apr 26 13:37:31 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
 

texinfo.spec

@@ -129,7 +129,7 @@ fi
 if cmp  %{buildroot}%{_mandir}/man1/pdftexi2dvi.1 %{buildroot}%{_mandir}/man1/texi2pdf.1
 then
     rm -vf %{buildroot}%{_mandir}/man1/pdftexi2dvi.1
-    ln -sf texi2pdf.1.gz %{buildroot}%{_mandir}/man1/pdftexi2dvi.1.gz
+    ln -sf texi2pdf.1%{?ext_man} %{buildroot}%{_mandir}/man1/pdftexi2dvi.1%{?ext_man}
 fi
 
 %if !0%{?usrmerged}
@@ -150,49 +150,48 @@ LANG=en_GB.UTF-8
 export LANG
 make %{?_smp_mflags} check
 
-%filetriggerin -n info -p <lua> -- %{_infodir}
+%global trigger_functions %{expand:
--- TODO: replace with rpm.execute after rpm 4.15
+-- Check if rpm.execute() as function call is given
-function execute(path, ...)
+if type(rpm.execute) == "function" then
+   execute = rpm.execute
+else
+  function execute(path, ...)
     local pid = posix.fork()
-  if pid == 0 then
-     posix.exec(path, ...)
-     io.write(path, ": exec failed: ", posix.errno(), "\n")
-     os.exit(1)
-  end
     if not pid then
        error(path .. ": fork failed: " .. posix.errno() .. "\n")
-  end
+    elseif pid == 0 then
+       assert(posix.exec(path, ...))
+    else
        posix.wait(pid)
+    end
+  end
 end
 --
+}
+
+%filetriggerin -n info -p <lua> -- %{_infodir}
+%trigger_functions
 file = rpm.next_file()
 while file do
-    if string.match(file, "%%.info%%.gz$") then
+    if string.match(file, "%%.info%%%{ext_info}$") then
+	stat = posix.stat(file)
+	if stat then
 	    execute("%{_bindir}/install-info", "--info-dir=%{_infodir}", file)
 	end
+    end
     file = rpm.next_file()
 end
 
 %filetriggerun -n info -p <lua> -- %{_infodir}
--- TODO: replace with rpm.execute after rpm 4.15
+%trigger_functions
-function execute(path, ...)
-  local pid = posix.fork()
-  if pid == 0 then
-     posix.exec(path, ...)
-     io.write(path, ": exec failed: ", posix.errno(), "\n")
-     os.exit(1)
-  end
-  if not pid then
-     error(path .. ": fork failed: " .. posix.errno() .. "\n")
-  end
-  posix.wait(pid)
-end
---
 file = rpm.next_file()
 while file do
-    if string.match(file, "%%.info%%.gz$") then
+    if string.match(file, "%%.info%%%{ext_info}$") then
+	stat = posix.stat(file)
+	if not stat then
 	    execute("%{_bindir}/install-info", "--quiet", "--delete", "--info-dir=%{_infodir}", file)
 	end
+    end
     file = rpm.next_file()
 end
 
@@ -231,7 +230,7 @@ end
 
 %files -n info
 %defattr(-,root,root,0755)
-%ghost %verify(not md5 size mtime) %{_infodir}/dir
+%ghost %verify(not mode md5 size mtime) %{_infodir}/dir
 %if !0%{?usrmerged}
 /sbin/install-info
 %else