From 9ee160ad3d6c8721f1e4b5cf28687b28181a587016f6cdc55e704f77c45549e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 5 Feb 2015 10:56:22 +0000 Subject: [PATCH 1/3] - Add zsh-texi2html-randomness.patch to prevent random changes in texi2html output (bnc#916186) OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=144 --- zsh-texi2html-randomness.patch | 13 +++++++++++++ zsh.changes | 6 ++++++ zsh.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 zsh-texi2html-randomness.patch diff --git a/zsh-texi2html-randomness.patch b/zsh-texi2html-randomness.patch new file mode 100644 index 0000000..8d9c53b --- /dev/null +++ b/zsh-texi2html-randomness.patch @@ -0,0 +1,13 @@ +Index: zsh-5.0.7/Doc/Makefile.in +=================================================================== +--- zsh-5.0.7.orig/Doc/Makefile.in ++++ zsh-5.0.7/Doc/Makefile.in +@@ -41,7 +41,7 @@ LN_S = @LN_S@ + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi + DVIPS = dvips +-TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files \ ++TEXI2HTML = PERL_HASH_SEED=0 @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files \ + --init-file texi2html.conf + + .SUFFIXES: .yo .1 diff --git a/zsh.changes b/zsh.changes index 869f0f2..e6d819f 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 5 10:48:40 UTC 2015 - idonmez@suse.com + +- Add zsh-texi2html-randomness.patch to prevent random changes + in texi2html output (bnc#916186) + ------------------------------------------------------------------- Wed Jan 28 17:53:20 UTC 2015 - idonmez@suse.com diff --git a/zsh.spec b/zsh.spec index a786c71..4f5b8dd 100644 --- a/zsh.spec +++ b/zsh.spec @@ -37,6 +37,7 @@ Source16: dotzshrc.rh Source17: zshprompt.pl %endif Patch1: trim-unneeded-completions.patch +Patch2: zsh-texi2html-randomness.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -94,6 +95,7 @@ This package contains the Zsh manual in html format. %setup -q -n %{name}-%{version} %if 0%{?suse_version} %patch1 -p1 +%patch2 -p1 %endif # Remove executable bit From ba4be0b64c24efdc90a694876ec2a37d618691d7e9ac1fca10828520cd7ae415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 5 Feb 2015 11:33:27 +0000 Subject: [PATCH 2/3] - OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=145 --- zsh-texi2html-randomness.patch | 13 ------------- zsh.changes | 6 ------ zsh.spec | 2 -- 3 files changed, 21 deletions(-) delete mode 100644 zsh-texi2html-randomness.patch diff --git a/zsh-texi2html-randomness.patch b/zsh-texi2html-randomness.patch deleted file mode 100644 index 8d9c53b..0000000 --- a/zsh-texi2html-randomness.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: zsh-5.0.7/Doc/Makefile.in -=================================================================== ---- zsh-5.0.7.orig/Doc/Makefile.in -+++ zsh-5.0.7/Doc/Makefile.in -@@ -41,7 +41,7 @@ LN_S = @LN_S@ - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi - DVIPS = dvips --TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files \ -+TEXI2HTML = PERL_HASH_SEED=0 @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files \ - --init-file texi2html.conf - - .SUFFIXES: .yo .1 diff --git a/zsh.changes b/zsh.changes index e6d819f..869f0f2 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Thu Feb 5 10:48:40 UTC 2015 - idonmez@suse.com - -- Add zsh-texi2html-randomness.patch to prevent random changes - in texi2html output (bnc#916186) - ------------------------------------------------------------------- Wed Jan 28 17:53:20 UTC 2015 - idonmez@suse.com diff --git a/zsh.spec b/zsh.spec index 4f5b8dd..a786c71 100644 --- a/zsh.spec +++ b/zsh.spec @@ -37,7 +37,6 @@ Source16: dotzshrc.rh Source17: zshprompt.pl %endif Patch1: trim-unneeded-completions.patch -Patch2: zsh-texi2html-randomness.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -95,7 +94,6 @@ This package contains the Zsh manual in html format. %setup -q -n %{name}-%{version} %if 0%{?suse_version} %patch1 -p1 -%patch2 -p1 %endif # Remove executable bit From 7a526a731d1c2d3dfc19010fc5018f5c5f81c6a5febddcb5e99e64087ffe866c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 10 Feb 2015 16:12:54 +0000 Subject: [PATCH 3/3] Accepting request 285043 from home:dimstar:Factory - BuildRequire texi2html instead of texinfo: the packages have been split completely now. OBS-URL: https://build.opensuse.org/request/show/285043 OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=146 --- zsh.changes | 6 ++++++ zsh.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/zsh.changes b/zsh.changes index 869f0f2..731ae5b 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 10 08:27:53 UTC 2015 - dimstar@opensuse.org + +- BuildRequire texi2html instead of texinfo: the packages have been + split completely now. + ------------------------------------------------------------------- Wed Jan 28 17:53:20 UTC 2015 - idonmez@suse.com diff --git a/zsh.spec b/zsh.spec index a786c71..b1b1f7f 100644 --- a/zsh.spec +++ b/zsh.spec @@ -47,7 +47,7 @@ BuildRequires: yodl %if 0%{?suse_version} >= 1210 BuildRequires: groff BuildRequires: makeinfo -BuildRequires: texinfo +BuildRequires: texi2html %endif %else Requires(pre): /sbin/install-info