diff --git a/gcc5-fix.patch b/gcc5-fix.patch new file mode 100644 index 0000000..8b07b4f --- /dev/null +++ b/gcc5-fix.patch @@ -0,0 +1,13 @@ +Index: zsh-5.0.7/Src/zsh.mdd +=================================================================== +--- zsh-5.0.7.orig/Src/zsh.mdd ++++ zsh-5.0.7/Src/zsh.mdd +@@ -23,7 +23,7 @@ hdrdeps="zshcurses.h zshterm.h" + + signames.c: signames1.awk signames2.awk ../config.h @SIGNAL_H@ + $(AWK) -f $(sdir)/signames1.awk @SIGNAL_H@ >sigtmp.c +- $(CPP) sigtmp.c >sigtmp.out ++ $(CPP) -P sigtmp.c >sigtmp.out + $(AWK) -f $(sdir)/signames2.awk sigtmp.out > $@ + rm -f sigtmp.c sigtmp.out + diff --git a/zsh-osc-completion.patch b/zsh-osc-completion.patch new file mode 100644 index 0000000..268ac8f --- /dev/null +++ b/zsh-osc-completion.patch @@ -0,0 +1,15 @@ +Index: zsh-5.0.7/Completion/openSUSE/Command/_osc +=================================================================== +--- zsh-5.0.7.orig/Completion/openSUSE/Command/_osc ++++ zsh-5.0.7/Completion/openSUSE/Command/_osc +@@ -16,8 +16,8 @@ + # version 0.2 + # + +-OSC_BUILD_TARGETS="openSUSE_12.1 openSUSE_12.2 openSUSE_12.3 openSUSE_Tumbleweed openSUSE_Factory SLE_11_SP2" +-OSC_PROJECTS="openSUSE:Factory openSUSE:Tumbleweed openSUSE:12.3 openSUSE:12.2 openSUSE:12.1" ++OSC_BUILD_TARGETS="openSUSE_13.1 openSUSE_13.2 openSUSE_Tumbleweed openSUSE_Factory SLE_11_SP3 SLE_12" ++OSC_PROJECTS="openSUSE:Factory openSUSE:Tumbleweed openSUSE:13.2 openSUSE:13.1" + + # user defined variables $OSC_BUILD_TARGETS_EXTRA and + # $OSC_PROJECTS_EXTRA can add to the project/build target list diff --git a/zsh.changes b/zsh.changes index 7dc7a92..cd89288 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun May 3 07:36:02 UTC 2015 - dmitry_r@opensuse.org + +- Fix openSUSE versions in osc completion + * zsh-osc-completion.patch + +------------------------------------------------------------------- +Wed Apr 29 08:30:49 UTC 2015 - idonmez@suse.com + +- Add gcc5-fix.patch to fix signames.c generation with gcc5 + ------------------------------------------------------------------- Wed Apr 22 12:45:53 UTC 2015 - hvogel@opensuse.org diff --git a/zsh.spec b/zsh.spec index b1b1f7f..ad77905 100644 --- a/zsh.spec +++ b/zsh.spec @@ -37,6 +37,9 @@ Source16: dotzshrc.rh Source17: zshprompt.pl %endif Patch1: trim-unneeded-completions.patch +Patch2: gcc5-fix.patch +# PATCH-FIX-OPENSUSE zsh-osc-completion.patch -- Fix openSUSE versions in osc completion +Patch3: zsh-osc-completion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -95,6 +98,8 @@ This package contains the Zsh manual in html format. %if 0%{?suse_version} %patch1 -p1 %endif +%patch2 -p1 +%patch3 -p1 # Remove executable bit chmod 0644 Etc/changelog2html.pl