From d290a3d331ddf8150ea3a2bc75137ad392c1b180 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 26 Nov 2013 16:02:22 -0500 Subject: [PATCH 1/2] messed up the rpmspec conditional --- golang.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/golang.spec b/golang.spec index b5d46b5..15a318e 100644 --- a/golang.spec +++ b/golang.spec @@ -42,7 +42,7 @@ BuildRequires: /bin/hostname BuildRequires: emacs # xemacs on fedora only -%if 0%{?fedora} >= 0 +%if 0%{?fedora} BuildRequires: xemacs xemacs-packages-extra %endif @@ -93,7 +93,7 @@ Summary: The Go Programming Language documentation tool %package vim Summary: Vim plugins for Go # xemacs on fedora only -%if 0%{?fedora} >= 0 +%if 0%{?fedora} Requires: vim-filesystem %endif BuildArch: noarch @@ -112,7 +112,7 @@ BuildArch: noarch # xemacs on fedora only -%if 0%{?fedora} >= 0 +%if 0%{?fedora} %package -n xemacs-%{name} Summary: XEmacs add-on package for Go Requires: xemacs(bin) >= %{_xemacs_version} @@ -181,7 +181,7 @@ cd .. cd misc mv emacs/go-mode-load.el emacs/%{name}-init.el # xemacs on fedora only -%if 0%{?fedora} >= 0 +%if 0%{?fedora} cp -av emacs xemacs %{_xemacs_bytecompile} xemacs/go-mode.el %endif @@ -236,7 +236,7 @@ cp -av misc/emacs/go-mode.* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} cp -av misc/emacs/%{name}-init.el $RPM_BUILD_ROOT%{_emacs_sitestartdir} # xemacs on fedora only -%if 0%{?fedora} >= 0 +%if 0%{?fedora} # misc/xemacs mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir} @@ -298,7 +298,7 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf # xemacs on fedora only -%if 0%{?fedora} >= 0 +%if 0%{?fedora} %files -n xemacs-%{name} %doc AUTHORS CONTRIBUTORS LICENSE PATENTS %{_xemacs_sitelispdir}/%{name} From 4e1713bb7ecd3baf5bbbad636e10aa1e673c6d78 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 26 Nov 2013 16:03:49 -0500 Subject: [PATCH 2/2] version bump --- golang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/golang.spec b/golang.spec index 15a318e..813474c 100644 --- a/golang.spec +++ b/golang.spec @@ -25,7 +25,7 @@ Name: golang Version: 1.1.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The Go Programming Language License: BSD @@ -307,6 +307,9 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf %changelog +* Tue Nov 26 2013 Vincent Batts - 1.1.2-8 +- fix the rpmspec conditional for rhel and fedora + * Thu Nov 21 2013 Vincent Batts - 1.1.2-7 - patch tests for testing on rawhide - let the same spec work for rhel and fedora