rpms
/
golang
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate noarch data package to work around RPM bug (bz #975909)

This commit is contained in:
Adam Goode 2013-06-28 22:09:26 -04:00
parent 5863470967
commit 467dc85f27
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
golang.spec
View File

@ -14,7 +14,7 @@
Name: golang Name: golang
Version: 1.1.1 Version: 1.1.1
Release: 3%{?dist} Release: 4%{?dist}
Summary: The Go Programming Language Summary: The Go Programming Language
License: BSD License: BSD
@ -29,8 +29,8 @@ Patch0: golang-1.1-verbose-build.patch
# Having godoc and the documentation separate was broken # Having godoc and the documentation separate was broken
Obsoletes: %{name}-godoc < 1.1-4 Obsoletes: %{name}-godoc < 1.1-4
# All the noarch stuff is in one package now # RPM can't handle symlink -> dir with subpackages, so merge back
Requires: %{name}-data = %{version}-%{release} Obsoletes: %{name}-data < 1.1.1-4
ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{ix86} x86_64 %{arm}
@ -38,14 +38,15 @@ ExclusiveArch: %{ix86} x86_64 %{arm}
%{summary}. %{summary}.
%package data # Restore this package if RPM gets fixed (bug #975909)
Summary: Required architecture-independent files for Go #%package data
Requires: %{name} = %{version}-%{release} #Summary: Required architecture-independent files for Go
BuildArch: noarch #Requires: %{name} = %{version}-%{release}
Obsoletes: %{name}-docs < 1.1-4 #BuildArch: noarch
#Obsoletes: %{name}-docs < 1.1-4
%description data #
%{summary}. #%description data
#%{summary}.
%package vim %package vim
@ -247,7 +248,8 @@ find $RPM_BUILD_ROOT%{_libdir}/%{name} -type f -print0 | xargs -0 touch -r $RPM_
%{_libdir}/%{name}/src %{_libdir}/%{name}/src
%files data # Restore data package when RPM bug is fixed (see above)
#%files data
%{_datadir}/bash-completion %{_datadir}/bash-completion
%{_datadir}/zsh %{_datadir}/zsh
@ -279,6 +281,9 @@ find $RPM_BUILD_ROOT%{_libdir}/%{name} -type f -print0 | xargs -0 touch -r $RPM_
%changelog %changelog
* Sat Jun 29 2013 Adam Goode <adam@spicenitz.org> - 1.1.1-4
- Eliminate noarch data package to work around RPM bug (bz #975909)
* Wed Jun 19 2013 Adam Goode <adam@spicenitz.org> - 1.1.1-3 * Wed Jun 19 2013 Adam Goode <adam@spicenitz.org> - 1.1.1-3
- Use lua for pretrans (http://fedoraproject.org/wiki/Packaging:Guidelines#The_.25pretrans_scriptlet) - Use lua for pretrans (http://fedoraproject.org/wiki/Packaging:Guidelines#The_.25pretrans_scriptlet)