Merge branch 'master' into f19

This commit is contained in:
Vincent Batts 2013-11-26 16:06:53 -05:00
commit d4e31c03ca
1 changed files with 10 additions and 7 deletions

View File

@ -25,7 +25,7 @@
Name: golang
Version: 1.1.2
Release: 7%{?dist}
Release: 8%{?dist}
Summary: The Go Programming Language
License: BSD
@ -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}
@ -307,6 +307,9 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
%changelog
* Tue Nov 26 2013 Vincent Batts <vbatts@redhat.com> - 1.1.2-8
- fix the rpmspec conditional for rhel and fedora
* Thu Nov 21 2013 Vincent Batts <vbatts@redhat.com> - 1.1.2-7
- patch tests for testing on rawhide
- let the same spec work for rhel and fedora