Add patch to fix build with newest po4a

This commit is contained in:
Sérgio M. Basto 2020-08-05 12:40:40 +01:00
parent bd4f8a8d08
commit df6a9e12a6
4 changed files with 16 additions and 27 deletions

View File

@ -1,5 +1,5 @@
--- etc/setup.d/common-data.orig 2010-08-23 09:54:15.000000000 -0700
+++ etc/setup.d/common-data 2010-08-23 09:52:22.000000000 -0700
--- ./etc/setup.d/common-data.orig 2010-08-23 09:54:15.000000000 -0700
+++ ./etc/setup.d/common-data 2010-08-23 09:52:22.000000000 -0700
@@ -18,6 +18,9 @@
# Common data for use in schroot setup scripts

View File

@ -1,5 +1,5 @@
--- etc/pam/schroot 2008-01-20 16:16:25.000000000 -0800
+++ etc/pam/schroot 2008-04-29 10:33:21.000000000 -0700
--- ./etc/pam/schroot 2008-01-20 16:16:25.000000000 -0800
+++ ./etc/pam/schroot 2008-04-29 10:33:21.000000000 -0700
@@ -26,9 +26,9 @@
# The standard Unix authentication modules, used with
# NIS (man nsswitch) as well as normal /etc/passwd and

8
schroot-po4a.patch Normal file
View File

@ -0,0 +1,8 @@
--- schroot-1.6.10/man/po4a.cfg.orig 2020-08-05 11:37:47.784691905 +0100
+++ schroot-1.6.10/man/po4a.cfg 2020-08-05 11:37:55.826742986 +0100
@@ -1,4 +1,4 @@
-[po_directory] po/
+[po_directory] man/po
[po4a_alias:man] man opt:"-M UTF-8 -L UTF-8"

View File

@ -31,6 +31,7 @@ Patch23: update_french_schroot_manpage_translation_2018.patch
Patch24: update_german_schroot_manpage_translation_2018.patch
Patch25: zfs-snapshot-support.patch
Patch26: cross.patch
Patch27: schroot-po4a.patch
BuildRequires: gcc-c++
@ -80,29 +81,7 @@ more functionality.
%prep
%setup -q
%patch0 -p0
%patch1 -p0
%patch3 -p1 -b .gcc8
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
%autosetup -p1
%build
@ -172,6 +151,7 @@ fakeroot %ctest || :
%config(noreplace) %{_sysconfdir}/schroot/setup.d/05file
%config(noreplace) %{_sysconfdir}/schroot/setup.d/05lvm
%config(noreplace) %{_sysconfdir}/schroot/setup.d/05union
%config(noreplace) %{_sysconfdir}/schroot/setup.d/05zfs
%config(noreplace) %{_sysconfdir}/schroot/setup.d/10mount
%config(noreplace) %{_sysconfdir}/schroot/setup.d/15killprocs
%config(noreplace) %{_sysconfdir}/schroot/setup.d/15binfmt
@ -206,6 +186,7 @@ fakeroot %ctest || :
%changelog
* Wed Aug 05 2020 Sérgio Basto <sergio@serjux.com> - 1.6.10-15
- Add latest patches from Debian
- Add patch to fix build with newest po4a
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.10-14
- Second attempt - Rebuilt for