Hello community,

here is the log from the commit of package go for openSUSE:Factory
checked in at Mon May 23 12:15:54 CEST 2011.



--------
--- go/go.changes       2011-05-20 15:40:38.000000000 +0200
+++ go/go.changes       2011-05-21 16:04:56.000000000 +0200
@@ -1,0 +2,36 @@
+Sat May 21 13:47:39 UTC 2011 - [email protected]
+
+- Switch %go_make* macros from make to gomake
+
+-------------------------------------------------------------------
+Sat May 21 12:09:28 UTC 2011 - [email protected]
+
+- Undo not installing *.h/*.c, remove hard links
+- Update to 21/05/2011 mercurial version
+- Added macro %go_make_test
+
+-------------------------------------------------------------------
+Fri May 20 19:36:59 UTC 2011 - [email protected]
+
+- Package more documentation 
+
+-------------------------------------------------------------------
+Fri May 20 19:00:22 UTC 2011 - [email protected]
+
+- Moved devel package back into main package until a better
+  solution pops up
+  * godoc and goinstall belong to base package and need only
+    sources in the $GOROOT/srcpkg tree
+  * No need to install *.h/*.c files
+- Fixed %{go_provides} macro to provide a specific version
+- Changed GOROOT path also in gotry script
+
+-------------------------------------------------------------------
+Fri May 20 14:32:53 UTC 2011 - [email protected]
+
+- Removed double provides for devel-static package
+- Provide a specific version for devel-static package
+- Less build dependencies, own directories directly
+- Added comments for rpmlint checks, removed old ones
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  go-0.0.r57.1+hg20110520.tar.bz2

New:
----
  go-0.0.r57.1+hg20110521.tar.bz2

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

Other differences:
------------------
++++++ go.spec ++++++
--- /var/tmp/diff_new_pack.uEs1B3/_old  2011-05-23 12:06:27.000000000 +0200
+++ /var/tmp/diff_new_pack.uEs1B3/_new  2011-05-23 12:06:27.000000000 +0200
@@ -19,7 +19,7 @@
 
 
 Name:           go
-Version:        0.0.r57.1+hg20110520
+Version:        0.0.r57.1+hg20110521
 Release:        1
 Summary:        A compiled, garbage-collected, concurrent programming language
 Group:          Development/Languages/Other
@@ -37,8 +37,10 @@
 BuildRequires:  fdupes
 Recommends:     go-doc
 %endif
-Provides:       libcgo = %{version}-%{release}
-Provides:       %{name}-devel-static
+Provides:       libcgo = %{version}
+Provides:       go-devel-static = %{version}
+Provides:       go-devel = %{version}
+Obsoletes:      go-devel < %{version}
 ExclusiveArch:  %ix86 x86_64 arm
 
 %description
@@ -53,34 +55,14 @@
 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
@@ -90,7 +72,6 @@
 
 Summary:        Go language syntax files for Emacs
 Group:          Productivity/Text/Editors
-Requires:       emacs
 Requires:       %{name} = %{version}
 
 %description emacs
@@ -100,15 +81,6 @@
 
 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
@@ -128,10 +100,10 @@
 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
+# compile and run full test suite (disable net tests)
 # 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
+#DISABLE_NET_TESTS=1 CFLAGS=$RPM_OPT_FLAGS LC_ALL=C PATH="$PATH:$GOBIN" 
./all.bash
+CFLAGS=$RPM_OPT_FLAGS LC_ALL=C PATH="$PATH:$GOBIN" ./make.bash
 
 %install
 export GOROOT="%{buildroot}%{_libdir}/%{name}"
@@ -150,39 +122,47 @@
 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
+# source files for goinstall, godoc, etc
+install -d %{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
+# replace $GOROOT in several scripts
+sed -i 's|GOROOT=.*$|GOROOT=%{_libdir}/go|g' %{buildroot}%{_bindir}/gomake
+sed -i 's|GOROOT=.*$|GOROOT=%{_libdir}/go|g' %{buildroot}%{_bindir}/gotry
 
 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
+# documentation and examples
+# fix documetation permissions (rpmlint warning)
+find doc/ misc/ -type f -exec chmod 0644 '{}' \;
+# remove unwanted arch-dependant binaries (rpmlint warning)
+rm misc/swig/{callback/run,stdio/hello}
 # 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}
+%define go_arch 386
 %endif
 %ifarch x86_64
 sed -i 's|GOARCH|amd64|' %{SOURCE3}
+%define go_arch amd64
 %endif
 %ifarch %arm
 sed -i 's|GOARCH|arm|' %{SOURCE3}
+%define go_arch arm
 %endif
 install -Dm644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.go
 
+# break hard links
+rm %{buildroot}%{_libdir}/go/pkg/linux_%{go_arch}/{cgocall,runtime}.h
+ln -s %{_datadir}/go/src/pkg/runtime/{cgocall,runtime}.h 
%{buildroot}%{_libdir}/go/pkg/linux_%{go_arch}/
+
 # issue #1242
 # Go binaries are supposedly DWARF compliant but brp_strip_debug breaks them
 export NO_BRP_STRIP_DEBUG=true
@@ -202,10 +182,6 @@
 %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
@@ -213,22 +189,26 @@
 %{_bindir}/cgo
 %{_bindir}/ebnflint
 %{_bindir}/go*
+%{_sbindir}/goinstall
+%{_libdir}/lib9.a
+%{_libdir}/libbio.a
+%{_libdir}/libmach.a
+%{_libdir}/go/
+%{_datadir}/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/*
+%doc doc misc
 
 %files vim
 %defattr(-,root,root,-)
+%dir %{_datadir}/vim
+%dir %{_datadir}/vim/site
+%dir %{_datadir}/vim/site/ftdetect
+%dir %{_datadir}/vim/site/syntax
 %{_datadir}/vim/site/syntax/go.vim
 %{_datadir}/vim/site/ftdetect/gofiletype.vim
 
@@ -238,6 +218,10 @@
 
 %files kate
 %defattr(-,root,root,-)
+%dir %{_datadir}/kde4
+%dir %{_datadir}/kde4/apps
+%dir %{_datadir}/kde4/apps/katepart
+%dir %{_datadir}/kde4/apps/katepart/syntax
 %{_datadir}/kde4/apps/katepart/syntax/go.xml
 
 %changelog

++++++ go-0.0.r57.1+hg20110520.tar.bz2 -> go-0.0.r57.1+hg20110521.tar.bz2 ++++++
go/go-0.0.r57.1+hg20110520.tar.bz2 go/go-0.0.r57.1+hg20110521.tar.bz2 differ: 
char 11, line 1

++++++ go-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.uEs1B3/_old  2011-05-23 12:06:27.000000000 +0200
+++ /var/tmp/diff_new_pack.uEs1B3/_new  2011-05-23 12:06:27.000000000 +0200
@@ -1,3 +1,2 @@
-addFilter("binaryinfo-readelf-failed")
-addFilter("statically-linked-binary")
-addFilter("non-conffile-in-etc") # needed for /etc/rpm/macros.go
+addFilter("binaryinfo-readelf-failed")  # go binaries are suposedly 
ELF-compliant
+addFilter("statically-linked-binary")   # go doesn't yet support dynamic 
linking

++++++ macros.go ++++++
--- /var/tmp/diff_new_pack.uEs1B3/_old  2011-05-23 12:06:27.000000000 +0200
+++ /var/tmp/diff_new_pack.uEs1B3/_new  2011-05-23 12:06:27.000000000 +0200
@@ -3,7 +3,7 @@
 # Copyright (c) 2011 Sascha Peilicke <[email protected]>
 #
 
-%go_ver         0.0.r57.1+hg20110520
+%go_ver         0.0.r57.1+hg20110521
 %go_arch        GOARCH
 
 %go_dir         %{_libdir}/go
@@ -11,12 +11,12 @@
 %go_sitearch    %{_libdir}/go/pkg/linux_%{go_arch}
 
 %go_requires \
-BuildRequires:  go = %{go_ver}
+Requires:       go = %{go_ver}
 
 %go_provides \
-Provides:       %{name}-devel \
-Provides:       %{name}-devel-static
+Provides:       %{name}-devel = %{version} \
+Provides:       %{name}-devel-static = %{version}
 
-%go_make GOROOT=%{go_dir} make
-
-%go_make_install GOROOT=%{go_dir} make install 
TARGDIR=%{buildroot}%{go_sitearch}
+%go_make gomake
+%go_make_install TARGDIR=%{buildroot}%{go_sitearch} gomake install
+%go_make_test gomake test


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



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to