commit mandoc for openSUSE:Factory
Hello community,
here is the log from the commit of package mandoc for openSUSE:Factory checked
in at 2020-09-24 16:14:09
Comparing /work/SRC/openSUSE:Factory/mandoc (Old)
and /work/SRC/openSUSE:Factory/.mandoc.new.4249 (New)
Package is "mandoc"
Thu Sep 24 16:14:09 2020 rev:4 rq:836372 version:1.14.5
Changes:
--- /work/SRC/openSUSE:Factory/mandoc/mandoc.changes2020-03-17
13:07:45.681689134 +0100
+++ /work/SRC/openSUSE:Factory/.mandoc.new.4249/mandoc.changes 2020-09-24
16:14:32.792916772 +0200
@@ -1,0 +2,10 @@
+Tue Sep 22 15:12:55 UTC 2020 - Ludwig Nussel
+
+- fix build fail (mandoc-1.14.5-dummy.diff)
+- switch to using rpm.execute() as rpm 4.15 is now available
+- tweak trigger scripts to handle missing files better (boo#1176194)
+ There is no perfect solution though
+ https://github.com/rpm-software-management/rpm/issues/1370
+- make triggers more verbose if VERBOSE_FILETRIGGERS is set
+
+---
New:
mandoc-1.14.5-dummy.diff
Other differences:
--
++ mandoc.spec ++
--- /var/tmp/diff_new_pack.EUW6HU/_old 2020-09-24 16:14:33.740917721 +0200
+++ /var/tmp/diff_new_pack.EUW6HU/_new 2020-09-24 16:14:33.744917725 +0200
@@ -19,6 +19,7 @@
Name: mandoc
Version:1.14.5
Release:0
+%define nvr %{name}-%{version}-%{release}
Summary:UNIX manpage compiler
License:ISC
Group: Productivity/Publishing/Troff
@@ -27,12 +28,16 @@
# PATCH-FEATURE-UPSTREAM empty_w-manpath.patch gh#neovim/neovim#11794
mc...@suse.com
# Add man -w producing manpath (among many other things)
Patch0: 1.14.5-master.patch
+# PATCH-FIX-openSUSE looks like newer gcc doesn't like those duplicated dummy
variables lnus...@suse.com
+Patch1: mandoc-1.14.5-dummy.diff
BuildRequires: zlib-devel
Provides: man = %{version}
Conflicts: man
Conflicts: groff
Conflicts: groff-full
Conflicts: makewhat
+# file triggers use rpm.execute()
+Conflicts: rpm < 4.15
%description
The mandoc manpage compiler toolset (formerly called "mdocml")
@@ -66,56 +71,54 @@
%{_sbindir}/makewhatis
%filetriggerin -p -- %{_mandir}
--- TODO: replace with rpm.execute after rpm 4.15
-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
---
-- no point registering individual files if we can call
-- makewhatis in %%post to catch all if
+if posix.getenv("VERBOSE_FILETRIGGERS") then
+print("%{nvr}: running file install trigger")
+end
if posix.access("%{_mandir}/mandoc.db") then
file = rpm.next_file()
while file do
if string.match(file, "%{_mandir}/man[^/]+/[^/]+%{?ext_man}$") then
-execute("%{_sbindir}/makewhatis", "-d", "%{_mandir}", file)
+if posix.access(file) then
+if posix.getenv("VERBOSE_FILETRIGGERS") then
+print("%{nvr}: adding " .. file)
+end
+rpm.execute("%{_sbindir}/makewhatis", "-d", "%{_mandir}", file)
+else
+io.stderr:write("%{nvr}: missing " .. file .. "\n")
+end
end
file = rpm.next_file()
end
+elseif posix.getenv("VERBOSE_FILETRIGGERS") then
+print("%{nvr}: missing mandoc.db, skipped")
end
+io.flush()
%filetriggerun -p -- %{_mandir}
--- TODO: replace with rpm.execute after rpm 4.15
-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)
+if posix.getenv("VERBOSE_FILETRIGGERS") then
+print("%{nvr}: running file remove trigger")
end
---
if posix.access("%{_mandir}/mandoc.db") then
file = rpm.next_file()
while file do
if string.match(file, "%{_mandir}/man[^/]+/[^/]+%{?ext_man}$") then
-execute("%{_sbindir}/makewhatis", "-u", "%{_mandir}", file)
+if posix.access(file) then
+if posix.getenv("VERBOSE_FILETRIGGERS") then
+print("%{nvr}: removing " .. file)
+end
+rpm.execute("%{_sbindir}/makewhatis", "-u", "%{_mandir}", file)
+else
+io.stderr:write("%{nvr}: missing " .. file .. "\n")
+end
end
file = rpm.next_file()
end
+elseif posix.getenv("VERBOSE_FILETRIGGERS") then
+print("%{nvr}:
commit mandoc for openSUSE:Factory
Hello community,
here is the log from the commit of package mandoc for openSUSE:Factory checked
in at 2020-03-17 13:07:37
Comparing /work/SRC/openSUSE:Factory/mandoc (Old)
and /work/SRC/openSUSE:Factory/.mandoc.new.3160 (New)
Package is "mandoc"
Tue Mar 17 13:07:37 2020 rev:3 rq:784376 version:1.14.5
Changes:
--- /work/SRC/openSUSE:Factory/mandoc/mandoc.changes2020-02-03
11:12:47.773829099 +0100
+++ /work/SRC/openSUSE:Factory/.mandoc.new.3160/mandoc.changes 2020-03-17
13:07:45.681689134 +0100
@@ -1,0 +2,7 @@
+Mon Feb 10 18:46:58 CET 2020 - Matej Cepl
+
+- Add 1.14.5-master.patch containing among many other things fix
+ allowing running ``man -w`` to get manpath.
+ (gh#neovim/neovim#11794)
+
+---
New:
1.14.5-master.patch
Other differences:
--
++ mandoc.spec ++
--- /var/tmp/diff_new_pack.xP70Tf/_old 2020-03-17 13:07:47.125690243 +0100
+++ /var/tmp/diff_new_pack.xP70Tf/_new 2020-03-17 13:07:47.125690243 +0100
@@ -24,6 +24,9 @@
Group: Productivity/Publishing/Troff
URL:http://mandoc.bsd.lv/
Source: http://mandoc.bsd.lv/snapshots/mandoc-%{version}.tar.gz
+# PATCH-FEATURE-UPSTREAM empty_w-manpath.patch gh#neovim/neovim#11794
mc...@suse.com
+# Add man -w producing manpath (among many other things)
+Patch0: 1.14.5-master.patch
BuildRequires: zlib-devel
Provides: man = %{version}
Conflicts: man
@@ -42,6 +45,7 @@
%prep
%setup -q
+%autopatch -p1
%build
%{?!make_build:%define make_build make %{?_smp_mflags} V=1 VERBOSE=1}
++ 1.14.5-master.patch ++
7696 lines (skipped)
commit mandoc for openSUSE:Factory
Hello community,
here is the log from the commit of package mandoc for openSUSE:Factory checked
in at 2020-02-03 11:12:33
Comparing /work/SRC/openSUSE:Factory/mandoc (Old)
and /work/SRC/openSUSE:Factory/.mandoc.new.26092 (New)
Package is "mandoc"
Mon Feb 3 11:12:33 2020 rev:2 rq:769150 version:1.14.5
Changes:
--- /work/SRC/openSUSE:Factory/mandoc/mandoc.changes2020-01-19
20:57:50.692063087 +0100
+++ /work/SRC/openSUSE:Factory/.mandoc.new.26092/mandoc.changes 2020-02-03
11:12:47.773829099 +0100
@@ -1,0 +2,17 @@
+Fri Jan 31 21:50:30 UTC 2020 - Matej Cepl
+
+- Conflict also groff-full
+
+---
+Fri Jan 10 10:36:08 UTC 2020 - Ludwig Nussel
+
+- get rid of alternatives altogether, just conflict (boo#1160568)
+
+---
+Thu Jan 9 10:13:07 UTC 2020 - Ludwig Nussel
+
+- update-alternatives --remove must be in %postun
+- own mandoc.db
+- add file triggers to update mandoc.db
+
+---
Other differences:
--
++ mandoc.spec ++
--- /var/tmp/diff_new_pack.pJjJGO/_old 2020-02-03 11:12:49.121829781 +0100
+++ /var/tmp/diff_new_pack.pJjJGO/_new 2020-02-03 11:12:49.137829789 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mandoc
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,13 +25,11 @@
URL:http://mandoc.bsd.lv/
Source: http://mandoc.bsd.lv/snapshots/mandoc-%{version}.tar.gz
BuildRequires: zlib-devel
-BuildRequires: update-alternatives
Provides: man = %{version}
Conflicts: man
Conflicts: groff
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
-
+Conflicts: groff-full
+Conflicts: makewhat
%description
The mandoc manpage compiler toolset (formerly called "mdocml")
@@ -57,78 +55,78 @@
cp -fv %{buildroot}%{_bindir}/apropos %{_tmppath}/
mv -fv %{_tmppath}/apropos %{buildroot}%{_sbindir}/makewhatis
-# create a dummy target for /etc/alternatives
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-for cmd in apropos man soelim ; do
-mv %{buildroot}%{_bindir}/$cmd{,.mandoc}
-ln -s -f %{_sysconfdir}/alternatives/$cmd %{buildroot}%{_bindir}/$cmd
-done
-
-mv %{buildroot}%{_sbindir}/makewhatis{,.mandoc}
-ln -s -f %{_sysconfdir}/alternatives/makewhatis
%{buildroot}%{_sbindir}/makewhatis
-
-# sec 1
-for man in apropos man soelim whatis ; do
-from=$(ls %{buildroot}%{_mandir}/man1/$man.1*)
-to=$(echo $from|sed -e 's!\.1$!!')-mandoc.1
-mv -v "$from" "$to"
-ln -s -f %{_sysconfdir}/alternatives/$man.1 "$from"
-done
-# sec 7
-for man in eqn man mdoc roff tbl ; do
-from=$(ls %{buildroot}%{_mandir}/man7/$man.7*)
-to=$(echo $from|sed -e 's!\.7$!!')-mandoc.7
-mv -v "$from" "$to"
-ln -s -f %{_sysconfdir}/alternatives/$man.7 "$from"
-done
+# ghost
+: > %{buildroot}%{_mandir}/mandoc.db
%post
-update-alternatives --install \
- %{_bindir}/man man %{_bindir}/man.mandoc 1000 \
- --slave %{_bindir}/apropos apropos %{_bindir}/apropos.mandoc \
- --slave %{_bindir}/soelim soelim %{_bindir}/soelim.mandoc \
- --slave %{_sbindir}/makewhatis makewhatis %{_sbindir}/makewhatis.mandoc \
- --slave %{_mandir}/man1/apropos.1%{?ext_man} apropos.1%{?ext_man}
%{_mandir}/man1/apropos-mandoc.1%{?ext_man} \
- --slave %{_mandir}/man1/man.1%{?ext_man} man.1%{?ext_man}
%{_mandir}/man1/man-mandoc.1%{?ext_man} \
- --slave %{_mandir}/man1/soelim.1%{?ext_man} soelim.1%{?ext_man}
%{_mandir}/man1/soelim-mandoc.1%{?ext_man} \
- --slave %{_mandir}/man1/whatis.1%{?ext_man} whatis.1%{?ext_man}
%{_mandir}/man1/whatis-mandoc.1%{?ext_man} \
- --slave %{_mandir}/man7/eqn.7%{?ext_man} eqn.7%{?ext_man}
%{_mandir}/man7/eqn-mandoc.7%{?ext_man} \
- --slave %{_mandir}/man7/man.7%{?ext_man} man.7%{?ext_man}
%{_mandir}/man7/man-mandoc.7%{?ext_man} \
- --slave %{_mandir}/man7/mdoc.7%{?ext_man} mdoc.7%{?ext_man}
%{_mandir}/man7/mdoc-mandoc.7%{?ext_man} \
- --slave %{_mandir}/man7/roff.7%{?ext_man} roff.7%{?ext_man}
%{_mandir}/man7/roff-mandoc.7%{?ext_man} \
- --slave %{_mandir}/man7/tbl.7%{?ext_man} tbl.7%{?ext_man}
%{_mandir}/man7/tbl-mandoc.7%{?ext_man}
-
-
-%preun
-if [ $1 -eq 0 ] ; then
- update-alternatives --remove man %{_bindir}/man.mandoc
-fi
+%{_sbindir}/makewhatis
+
+%filetriggerin -p -- %{_mandir}
+-- TODO: replace with rpm.execute after rpm 4.15
+function execute(path, ...)
+ local pid = posix.fork()
+ if pid == 0 then
+ posix.exec(path, ...)
+ io.write(pat
