Browse Source

golang-1.17-1

Tomohiro "Tomo-p" KATO 2 years ago
parent
commit
e636c28074
1 changed files with 11 additions and 6 deletions
  1. 11 6
      g/golang/golang-vl.spec

+ 11 - 6
g/golang/golang-vl.spec

@@ -23,8 +23,10 @@
 # contains binary-like things (ELF data for tests, etc)
 %global _binaries_in_noarch_packages_terminate_build 0
 
+%if 0
 # Do not check any files in doc or src for requires
-#global __requires_exclude_from ^(%{_datadir}|/usr/lib)/%{name}/(doc|src)/.*$
+%global __requires_exclude_from ^(%{_datadir}|/usr/lib)/%{name}/(doc|src)/.*$
+%endif
 
 # Don't alter timestamps of especially the .a files (or else go will rebuild later)
 # Actually, don't strip at all since we are not even building debug packages and this corrupts the dwarf testdata
@@ -78,7 +80,7 @@
 Summary:        The Go Programming Language
 Summary(ja):    プログラミング言語 Go
 Name:           golang
-Version:        1.16.6
+Version:        1.17
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -241,7 +243,7 @@ mkdir -p $RPM_BUILD_ROOT%{goroot}
 
 # install everything into libdir (until symlink problems are fixed)
 # https://code.google.com/p/go/issues/detail?id=5830
-cp -apv api bin doc favicon.ico lib pkg robots.txt src misc test VERSION \
+cp -apv api bin doc lib pkg src misc test VERSION \
    $RPM_BUILD_ROOT%{goroot}
 
 # bz1099206
@@ -317,8 +319,8 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
 
 # rpm macros
 mkdir -p %{buildroot}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-cp -av %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.golang
+mkdir -p $RPM_BUILD_ROOT%{_rpmmacrodir}
+cp -av %{SOURCE102} $RPM_BUILD_ROOT%{_rpmmacrodir}/
 
 
 %check
@@ -392,7 +394,7 @@ fi
 # prelink blacklist
 %{_sysconfdir}/prelink.conf.d
 
-%{_sysconfdir}/rpm/macros.golang
+%{_rpmmacrodir}/macros.golang
 
 %files -f go-src.list src
 
@@ -412,6 +414,9 @@ fi
 
 
 %changelog
+* Wed Aug 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.17-1
+- new upstream release.
+
 * Sat Jul 31 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.6-1
 - new upstream release.