Hello community,

here is the log from the commit of package go for openSUSE:Factory
checked in at Fri May 20 16:28:14 CEST 2011.



--------
New Changes file:

--- /dev/null   2010-08-26 16:28:41.000000000 +0200
+++ go/go.changes       2011-05-20 15:40:38.000000000 +0200
@@ -0,0 +1,162 @@
+-------------------------------------------------------------------
+Fri May 20 09:51:49 UTC 2011 - sasc...@suse.de
+
+- Disable brp-strip-static-archive also on RHEL and CentOS
+
+-------------------------------------------------------------------
+Fri May 20 09:31:49 UTC 2011 - sasc...@suse.de
+
+- Fix %go_make_install macro, wrong TARGDIR
+
+-------------------------------------------------------------------
+Fri May 20 09:25:13 UTC 2011 - sasc...@suse.de
+
+- Update to 20/05/2011 mercurial version
+- Macro %go_arch in macros.go now properly set to correct value
+
+-------------------------------------------------------------------
+Thu May 19 18:22:16 UTC 2011 - sasc...@gmx.de
+
+- Fix RPM macros, add arm support
+
+-------------------------------------------------------------------
+Thu May 19 18:11:00 UTC 2011 - sasc...@gmx.de
+
+- Added RPM macros file to simply Go packaging
+- Provide devel-static file in main package
+- Spec file cleanup
+- Remove devel-file-in-non-devel-package rpmlint filter
+- Use proper package versioning scheme (needs reinstall)
+
+-------------------------------------------------------------------
+Wed May 18 13:48:48 UTC 2011 - sasc...@suse.de
+
+- Disable brp-strip-static-archive on Fedora
+
+-------------------------------------------------------------------
+Wed May 18 13:09:12 UTC 2011 - sasc...@suse.de
+
+- Re-add STRIP=/bin/true to fix Fedora build
+
+-------------------------------------------------------------------
+Wed May 18 12:41:25 UTC 2011 - sasc...@suse.de
+
+- Let devel package provide devel-static
+- Fix typo in devel package description
+
+-------------------------------------------------------------------
+Wed May 18 09:52:17 UTC 2011 - sasc...@suse.de
+
+- Update to 18/05/2011 upstream mercurial release
+- Rebased godoc patch
+- Removed doc/talks/go_talk-20091030.pdf, fixes bnc#686557
+- No chrpath necessary anymore
+- Use fdupes
+- Drop executable-stack rpmlint filter, not needed anymore
+
+-------------------------------------------------------------------
+Fri Apr 29 18:28:24 UTC 2011 - sasc...@gmx.de
+
+- Update to 29/04/2011 upstream mercurial release
+- Changed RPM variables to macros
+
+-------------------------------------------------------------------
+Mon Mar 21 15:12:45 UTC 2011 - sasc...@suse.de
+
+- Changed license from BSD to BSD3c
+- Remove pkg_version macro, use %%{version} directly
+- No Requires on %%{release}
+
+-------------------------------------------------------------------
+Tue Mar  8 18:16:34 UTC 2011 - gra...@andtech.eu
+
+- Update to 07/03/2011 .1 upstream mercurual release
+- Update godoc patch to reflect changes to path package 
+
+-------------------------------------------------------------------
+Tue Mar  1 13:12:30 UTC 2011 - gra...@andtech.eu
+
+- Update to 24/02/2011 upstream mercurial release 
+
+-------------------------------------------------------------------
+Wed Feb 16 05:21:20 UTC 2011 - gra...@andtech.eu
+
+- Update to 15/12/2011 upstream mercurial release
+- Remove redundant workarounds from .spec 
+
+-------------------------------------------------------------------
+Tue Feb  8 16:51:09 UTC 2011 - gra...@andtech.eu
+
+- add go-devel for pkg and cmd source installation, this is
+  intended to support goinstall(once patched).
+- Move goinstall binary to go-devel package and install to
+  %{_sbindir}
+- Change the godoc patch to generate API docs from the source
+  install location of go-devel 
+
+-------------------------------------------------------------------
+Tue Feb  1 11:31:23 UTC 2011 - gra...@andtech.eu
+
+- Updated to release 20/01/2011
+- run full test suite (without net dependant tests)
+- remove redundant libcgo.so from .spec 
+
+-------------------------------------------------------------------
+Wed Dec  8 16:26:27 UTC 2010 - sasc...@suse.de
+
+- Updated to 08/12/2010 mercurial version
+
+-------------------------------------------------------------------
+Thu Dec  2 08:16:35 UTC 2010 - speili...@novell.com
+
+- Updated to 02/12/2010 mercurial version
+
+-------------------------------------------------------------------
+Tue Nov 16 08:52:36 UTC 2010 - speili...@novell.com
+
+- Updated to 16/11/2010 mercurial version
+
+-------------------------------------------------------------------
+Tue Nov  9 21:53:50 UTC 2010 - speili...@novell.com
+
+- Updated to 09/11/2010 mercurial version
+
+-------------------------------------------------------------------
+Mon Nov  8 20:31:07 UTC 2010 - speili...@novell.com
+
+- Simplified spec file
+
+-------------------------------------------------------------------
+Mon Nov  8 09:36:14 UTC 2010 - speili...@novell.com
+
+- Fixed tarball (no hg history and build files)
+
+-------------------------------------------------------------------
+Mon Nov  8 09:06:28 UTC 2010 - speili...@novell.com
+
+- Updated to 08/11/2010 mercurial version
+
+-------------------------------------------------------------------
+Thu Oct 14 06:56:54 UTC 2010 - speili...@novell.com
+
+- Updated to 13/08/2010 mercurial version
+
+-------------------------------------------------------------------
+Mon Oct 11 08:27:00 UTC 2010 - speili...@novell.com
+
+- Example scripts permissions fixed
+
+-------------------------------------------------------------------
+Fri Oct  8 13:26:51 UTC 2010 - speili...@novell.com
+
+- Updated to 10/08/2010 mercurial version
+
+-------------------------------------------------------------------
+Wed Jun 16 14:38:33 UTC 2010 - gra...@andtech.eu
+
+- Initial package based on 09/06/2010 release
+
+-------------------------------------------------------------------
+Thu Apr 29 10:00:00 UTC 2010 - kon...@tylerc.org>
+
+- Initial Go hg release spec template

calling whatdependson for head-i586


New:
----
  go-0.0.r57.1+hg20110520.tar.bz2
  go-rpmlintrc
  go.changes
  go.sh
  go.spec
  godoc-path-locations.patch
  macros.go

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ go.spec ++++++
#
# spec file for package go
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011, Sascha Peilicke <sasc...@gmx.de>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#



Name:           go
Version:        0.0.r57.1+hg20110520
Release:        1
Summary:        A compiled, garbage-collected, concurrent programming language
Group:          Development/Languages/Other
License:        BSD3c
Url:            http://golang.org/
Source0:        go-%{version}.tar.bz2
Source1:        go-rpmlintrc
Source2:        go.sh
Source3:        macros.go
Patch1:         godoc-path-locations.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildRequires:  ed
BuildRequires:  bison
%if 0%{?suse_version} > 1020
BuildRequires:  fdupes
Recommends:     go-doc
%endif
Provides:       libcgo = %{version}-%{release}
Provides:       %{name}-devel-static
ExclusiveArch:  %ix86 x86_64 arm

%description
Go is an expressive, concurrent, garbage collected systems programming language
that is type safe and memory safe. It has pointers but no pointer arithmetic.
Go has fast builds, clean syntax, garbage collection, methods for any type, and
run-time reflection. It feels like a dynamic language but has the speed and
safety of a static language.

%package doc

Summary:        Go documentation
Group:          Documentation/Other
Requires:       %{name} = %{version}
Requires:       go-devel

%description doc
Go examples and documentation.

%package devel

Summary:        Toolchain and standard library sources, goinstall utility
Group:          Development/Languages/Other
Requires:       %{name} = %{version}
Provides:       %{name}-devel-static

%description devel
Contains source code files for the Go toolchain compilers, linkers and command
utilities. Contains the "goinstall" utility for installing third party packages
which requires the go standard library source to be installed.

%package vim

Summary:        Go syntax files for Vim
Group:          Productivity/Text/Editors
%if 0%{?suse_version}
BuildRequires:  vim-base
Requires:       vim-base
%else
BuildRequires:  vim
Requires:       vim
%endif
Requires:       %{name} = %{version}

%description vim
Vim syntax highlighting scheme for the Go programming language.

%package emacs

Summary:        Go language syntax files for Emacs
Group:          Productivity/Text/Editors
Requires:       emacs
Requires:       %{name} = %{version}

%description emacs
Emacs syntax highlighting scheme for the Go programming language.

%package kate

Summary:        Go syntax files for Kate and KWrite editors
Group:          Productivity/Text/Editors
%if 0%{?suse_version} >= 1120
BuildRequires:  kate
Requires:       kate
%else
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
BuildRequires:  kdelibs4
Requires:       kdelibs4
%endif
%endif
Requires:       %{name} = %{version}

%description kate
Kate syntax highlighting scheme for the Go programming language.

%prep
%setup -q -n %{name}
%patch1 -p1

%build
export GOROOT="`pwd`"
export GOBIN="$GOROOT/bin"
mkdir -p "$GOBIN"

cd src
# remove computer lang benchmark tests, coelab wiki, dashboard... from run.bash
sed '94,113d' $GOROOT/src/run.bash > $GOROOT/src/run.tmp
mv $GOROOT/src/run.tmp $GOROOT/src/run.bash

# disable net tests and run full test suite
# TODO: testing is broken currently, re-enable with new upstream version
#DISABLE_NET_TESTS=1 CFLAGS=${RPM_OPT_FLAGS} LC_ALL=C PATH="$PATH:$GOBIN" 
./all.bash
CFLAGS=${RPM_OPT_FLAGS} STRIP=/bin/true LC_ALL=C PATH="$PATH:$GOBIN" ./make.bash

%install
export GOROOT="%{buildroot}%{_libdir}/%{name}"
install -Dm644 misc/bash/go %{buildroot}%{_sysconfdir}/bash_completion.d/go
install -Dm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/go.sh
install -Dm644 misc/emacs/go-mode-load.el 
%{buildroot}%{_datadir}/emacs/site-lisp/go-mode-load.el
install -Dm644 misc/emacs/go-mode.el 
%{buildroot}%{_datadir}/emacs/site-lisp/go-mode.el
install -Dm644 misc/vim/syntax/go.vim 
%{buildroot}%{_datadir}/vim/site/syntax/go.vim
install -Dm644 misc/vim/ftdetect/gofiletype.vim 
%{buildroot}%{_datadir}/vim/site/ftdetect/gofiletype.vim
install -Dm644 misc/kate/go.xml 
%{buildroot}%{_datadir}/kde4/apps/katepart/syntax/go.xml
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sbindir}
cp -r bin/* %{buildroot}%{_bindir}
mv %{buildroot}%{_bindir}/goinstall %{buildroot}%{_sbindir}/goinstall
rm -f %{buildroot}%{_bindir}/{hgpatch,quietgcc}
mkdir -p $GOROOT/src
install -m644 src/Make.{ccmd,clib,cmd,common,inc,pkg} $GOROOT/src

# source files for goinstall, godoc etc
mkdir %{buildroot}%{_datadir}/go
for ext in *.{go,c,h}; do
  find src -name ${ext} -exec install -Dm644 \{\} 
%{buildroot}%{_datadir}/go/\{\} \;
done

# replace $GOROOT in gomake script
sed -i 's|GOROOT=.*$|GOROOT=%{_libdir}/go$|g' %{buildroot}%{_bindir}/gomake

install -Dm644 lib/{lib9.a,libbio.a,libmach.a} %{buildroot}%{_libdir}
cp -r lib/godoc $GOROOT/lib
cp -r pkg $GOROOT

# documentation
mkdir -p doc/examples
mv doc/{prog.sh,makehtml,progs} doc/examples
mv misc/cgo doc/examples
chmod 644 doc/codelab/wiki/test.sh
# fix bnc#686557, contains image licensed under non-commercial license
rm doc/talks/go_talk-20091030.pdf

# install RPM macros and set proper go_arch (BSD-like scheme)
%ifarch %ix86
sed -i 's|GOARCH|386|' %{SOURCE3}
%endif
%ifarch x86_64
sed -i 's|GOARCH|amd64|' %{SOURCE3}
%endif
%ifarch %arm
sed -i 's|GOARCH|arm|' %{SOURCE3}
%endif
install -Dm644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.go

# issue #1242
# Go binaries are supposedly DWARF compliant but brp_strip_debug breaks them
export NO_BRP_STRIP_DEBUG=true

# Disable brp-strip-static-archive on Fedora, breaks build
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
%define __os_install_post %(echo '%{__os_install_post}' | sed -e 
's!/usr/lib/rpm/[^/]*/?brp-strip-static-archive %{__strip}!!g')
%endif

%if 0%{?suse_version} > 1020
%fdupes %{buildroot}
%endif

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS CONTRIBUTORS LICENSE PATENTS README
%{_libdir}/go
%{_libdir}/lib9.a
%{_libdir}/libbio.a
%{_libdir}/libmach.a
%ifarch %ix86
%{_bindir}/8*
%endif
%{_bindir}/6*
%{_bindir}/cgo
%{_bindir}/ebnflint
%{_bindir}/go*
%config %{_sysconfdir}/bash_completion.d/go
%config %{_sysconfdir}/profile.d/go.sh
%config %{_sysconfdir}/rpm/macros.go

%files devel
%defattr(-,root,root,-)
%{_sbindir}/goinstall
%dir %{_datadir}/go
%{_datadir}/go/*

%files doc
%defattr(-,root,root,-)
%doc doc/*

%files vim
%defattr(-,root,root,-)
%{_datadir}/vim/site/syntax/go.vim
%{_datadir}/vim/site/ftdetect/gofiletype.vim

%files emacs
%defattr(-,root,root,-)
%{_datadir}/emacs/site-lisp/go-mode*.el

%files kate
%defattr(-,root,root,-)
%{_datadir}/kde4/apps/katepart/syntax/go.xml

%changelog
++++++ go-rpmlintrc ++++++
addFilter("binaryinfo-readelf-failed")
addFilter("statically-linked-binary")
addFilter("non-conffile-in-etc") # needed for /etc/rpm/macros.go
++++++ go.sh ++++++
# go toolchain env paths
gopath=lib
arch=386
if [ -x /usr/lib64/go ] ; then
  gopath=lib64
  arch=amd64
fi  

export GOOS="linux"
export GOARCH=$arch
export GOROOT=/usr/$gopath/go
export GOBIN=/usr/bin
++++++ godoc-path-locations.patch ++++++
--- a/src/cmd/godoc/godoc.go    2011-03-08 18:46:40.906386884 +0100
+++ b/src/cmd/godoc/godoc.go    2011-03-08 19:10:03.880387209 +0100
@@ -78,12 +78,15 @@
        pkgHandler httpHandler
 )
 
+// for openSUSE packaging of godoc
+const docroot = "/usr/share/doc/packages/go-doc/"
+const srcroot = "/usr/share/go/"
 
 func initHandlers() {
        fsMap.Init(*pkgPath)
-       fileServer = http.FileServer(*goroot, "")
-       cmdHandler = httpHandler{"/cmd/", filepath.Join(*goroot, "src", "cmd"), 
false}
-       pkgHandler = httpHandler{"/pkg/", filepath.Join(*goroot, "src", "pkg"), 
true}
+       fileServer = http.FileServer(docroot, "")
+       cmdHandler = httpHandler{"/cmd/", filepath.Join(srcroot, "src/cmd"), 
false}
+       pkgHandler = httpHandler{"/pkg/", filepath.Join(srcroot, "src/pkg"), 
true}
 }
 
 
@@ -634,7 +637,7 @@
 
 
 func readTemplate(name string) *template.Template {
-       path := filepath.Join(*goroot, "lib", "godoc", name)
+       path := filepath.Join(*goroot, "lib/"+name)
        if *templateDir != "" {
                defaultpath := path
                path = filepath.Join(*templateDir, name)
@@ -819,13 +822,19 @@
 
 
 func serveFile(w http.ResponseWriter, r *http.Request) {
+       // openSUSE: serv docs from root of go-doc package install location
+       if strings.HasPrefix(r.URL.Path, "/doc/") {
+                       http.Redirect(w, r, "/"+ r.URL.Path[len("/doc"):], 
http.StatusMovedPermanently)
+                       return
+       }
+       
        relpath := r.URL.Path[1:] // serveFile URL paths start with '/'
-       abspath := absolutePath(relpath, *goroot)
+       abspath := absolutePath(relpath, docroot)
 
        // pick off special cases and hand the rest to the standard file server
        switch r.URL.Path {
        case "/":
-               serveHTMLDoc(w, r, filepath.Join(*goroot, "doc", "root.html"), 
"doc/root.html")
+               serveHTMLDoc(w, r, filepath.Join(docroot, "root.html"), 
"root.html")
                return
 
        case "/doc/root.html":
++++++ macros.go ++++++
# Macros for Go module building.
#
# Copyright (c) 2011 Sascha Peilicke <sasc...@gmx.de>
#

%go_ver         0.0.r57.1+hg20110520
%go_arch        GOARCH

%go_dir         %{_libdir}/go
%go_sitedir     %{_libdir}/go/pkg
%go_sitearch    %{_libdir}/go/pkg/linux_%{go_arch}

%go_requires \
BuildRequires:  go = %{go_ver}

%go_provides \
Provides:       %{name}-devel \
Provides:       %{name}-devel-static

%go_make GOROOT=%{go_dir} make

%go_make_install GOROOT=%{go_dir} make install 
TARGDIR=%{buildroot}%{go_sitearch}

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to