@@ -1,7 +1,7 @@

 Summary:       GoBGP based Calico BGP Daemon

 Name:          calico-bgp-daemon

 Version:       0.2.2

-Release:       1%{?dist}

+Release:       2%{?dist}

 Group:         Applications/System

 Vendor:        VMware, Inc.

 License:       Apache-2.0

@@ -12,6 +12,7 @@ BuildRequires: git

 BuildRequires: glide

 BuildRequires: go >= 1.7

 %define sha1 calico-bgp-daemon=d823d92d1bbb887ea885080ab2b989a75e3a338d

+%define debug_package %{nil}

 %description

 GoBGP based Calico BGP Daemon, an alternative to BIRD in calico/node.

@@ -26,19 +27,18 @@ cp -r * ${GOPATH}/src/github.com/projectcalico/calico-bgp-daemon/.

 pushd ${GOPATH}/src/github.com/projectcalico/calico-bgp-daemon

 mkdir -p dist

 glide install --strip-vendor

-go get -v github.com/osrg/gobgp/gobgp

 go build -v -o dist/calico-bgp-daemon -ldflags "-X main.VERSION=%{version} -s -w" main.go ipam.go

 %install

 install -vdm 755 %{buildroot}%{_bindir}

-install ${GOPATH}/bin/gobgp %{buildroot}%{_bindir}/

 install ${GOPATH}/src/github.com/projectcalico/calico-bgp-daemon/dist/calico-bgp-daemon %{buildroot}%{_bindir}/

 %files

 %defattr(-,root,root)

-%{_bindir}/gobgp

 %{_bindir}/calico-bgp-daemon

 %changelog

+*    Mon Sep 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.2.2-2

+-    gobgp comes from the Go BGP package.

 *    Thu Aug 17 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.2.2-1

 -    Calico BGP daemon for PhotonOS.

@@ -1,33 +1,37 @@

 Summary:       A per-host daemon for Calico

 Name:          calico-felix

 Version:       2.4.1

-Release:       1%{?dist}

+Release:       2%{?dist}

 Group:         Applications/System

 Vendor:        VMware, Inc.

 License:       Apache-2.0

 URL:           https://github.com/projectcalico/felix

 Source0:       %{name}-%{version}.tar.gz

+%define sha1 calico-felix=4408e0b30fee66d8813bf0351094f4b4af7d6813

+Source1:       gogo-protobuf-0.4.tar.gz

+%define sha1 gogo-protobuf-0.4=4fc5dda432ad929ce203486c861b7d3e48681150

 Distribution:  Photon

 BuildRequires: git

 BuildRequires: glide

 BuildRequires: go >= 1.7

 BuildRequires: protobuf

-%define sha1 calico-felix=4408e0b30fee66d8813bf0351094f4b4af7d6813

 %description

 A per-host daemon for Calico.

 %prep

 %setup -q -n felix-%{version}

+mkdir -p ${GOPATH}/src/github.com/gogo/protobuf

+tar xf %{SOURCE1} --no-same-owner --strip-components 1 -C ${GOPATH}/src/github.com/gogo/protobuf/

 %build

+pushd ${GOPATH}/src/github.com/gogo/protobuf

+make install

+popd

 mkdir -p /root/.glide

 mkdir -p ${GOPATH}/src/github.com/projectcalico/felix

 cp -r * ${GOPATH}/src/github.com/projectcalico/felix/.

 pushd ${GOPATH}/src/github.com/projectcalico/felix

-go get -u github.com/onsi/ginkgo/ginkgo

-go get -u github.com/gogo/protobuf/protoc-gen-gogofaster

-go install github.com/gogo/protobuf/protoc-gen-gogofaster

 glide install --strip-vendor

 mkdir -p bin

 cd proto

@@ -48,5 +52,7 @@ install ${GOPATH}/src/github.com/projectcalico/felix/bin/calico-felix %{buildroo

 %{_bindir}/calico-felix

 %changelog

+*    Tue Sep 12 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.1-2

+-    Build protoc-gen-gogofaster plugin from source.

 *    Sat Aug 19 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.4.1-1

 -    Calico Felix for PhotonOS.

new file mode 100644

@@ -0,0 +1,52 @@

+Summary:       BGP implementation in Go

+Name:          gobgp

+Version:       1.23

+Release:       1%{?dist}

+Group:         Applications/System

+Vendor:        VMware, Inc.

+License:       Apache-2.0

+URL:           https://github.com/osrg/gobgp

+Source0:       %{name}-%{version}.tar.gz

+%define sha1 gobgp=3df002f61911cf56c33bd4350fe9d2ad39bcfca5

+Source1:       golang-dep-0.3.0.tar.gz

+%define sha1 golang-dep-0.3.0=e5e9952227930fe1e8632edc03d690bffc3e1132

+Distribution:  Photon

+BuildRequires: git

+BuildRequires: go >= 1.7

+%define debug_package %{nil}

+

+%description

+GoBGP is an open source BGP implementation designed from scratch for modern environment and implemented in a modern programming language, the Go Programming Language.

+

+%prep

+%setup -q

+mkdir -p ${GOPATH}/src/github.com/golang/dep

+tar xf %{SOURCE1} --no-same-owner --strip-components 1 -C ${GOPATH}/src/github.com/golang/dep/

+

+%build

+pushd ${GOPATH}/src/github.com/golang/dep

+CGO_ENABLED=0 GOOS=linux go build -v -ldflags "-s -w" -o ${GOPATH}/bin/dep ./cmd/dep/

+popd

+mkdir -p ${GOPATH}/src/github.com/osrg/gobgp

+cp -r * ${GOPATH}/src/github.com/osrg/gobgp/.

+pushd ${GOPATH}/src/github.com/osrg/gobgp

+${GOPATH}/bin/dep ensure

+mkdir -p dist

+go build -v -o dist/gobgp -ldflags "-X main.VERSION=%{version} -s -w" gobgp/main.go

+go build -v -o dist/gobgpd -ldflags "-X main.VERSION=%{version} -s -w" gobgpd/main.go gobgpd/util.go

+

+%install

+pushd ${GOPATH}/src/github.com/osrg/gobgp

+install -vdm 755 %{buildroot}%{_bindir}

+install ${GOPATH}/src/github.com/osrg/gobgp/dist/gobgp %{buildroot}%{_bindir}/

+install ${GOPATH}/src/github.com/osrg/gobgp/dist/gobgpd %{buildroot}%{_bindir}/

+

+%files

+%defattr(-,root,root)

+%{_bindir}/gobgp

+%{_bindir}/gobgpd

+%doc LICENSE README.md

+

+%changelog

+*    Mon Sep 11 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.23-1

+-    Go BGP daemon for PhotonOS.

@@ -23,6 +23,11 @@ CALICO_BGP_VER_REL=${CALICO_BGP_VER}-`cat ${SPEC_DIR}/calico-bgp-daemon/calico-b

 CALICO_BGP_RPM=calico-bgp-daemon-${CALICO_BGP_VER_REL}${DIST_TAG}.${ARCH}.rpm

 CALICO_BGP_RPM_FILE=${STAGE_DIR}/RPMS/x86_64/${CALICO_BGP_RPM}

+GO_BGP_VER=`cat ${SPEC_DIR}/gobgp/gobgp.spec | grep Version | cut -d: -f2 | tr -d ' '`

+GO_BGP_VER_REL=${GO_BGP_VER}-`cat ${SPEC_DIR}/gobgp/gobgp.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`

+GO_BGP_RPM=gobgp-${GO_BGP_VER_REL}${DIST_TAG}.${ARCH}.rpm

+GO_BGP_RPM_FILE=${STAGE_DIR}/RPMS/x86_64/${GO_BGP_RPM}

+

 CALICO_BIRD_VER=`cat ${SPEC_DIR}/calico-bird/calico-bird.spec | grep Version | cut -d: -f2 | tr -d ' '`

 CALICO_BIRD_VER_REL=${CALICO_BIRD_VER}-`cat ${SPEC_DIR}/calico-bird/calico-bird.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`

 CALICO_BIRD_RPM=calico-bird-${CALICO_BIRD_VER_REL}${DIST_TAG}.${ARCH}.rpm

@@ -70,6 +75,12 @@ then

     exit 1

 fi

+if [ ! -f ${GO_BGP_RPM_FILE} ]

+then

+    echo "GoBGP RPM ${GO_BGP_RPM_FILE} not found. Exiting.."

+    exit 1

+fi

+

 if [ ! -f ${CALICO_BIRD_RPM_FILE} ]

 then

     echo "Calico BIRD RPM ${CALICO_BIRD_RPM_FILE} not found. Exiting.."

@@ -131,6 +142,7 @@ fi

 mkdir -p tmp/calico

 cp ${CALICO_RPM_FILE} tmp/calico/

 cp ${CALICO_BGP_RPM_FILE} tmp/calico/

+cp ${GO_BGP_RPM_FILE} tmp/calico/

 cp ${CALICO_BIRD_RPM_FILE} tmp/calico/

 cp ${CALICO_CONFD_RPM_FILE} tmp/calico/

 cp ${CALICO_FELIX_RPM_FILE} tmp/calico/

@@ -141,6 +153,7 @@ cp ${CALICO_K8S_POLICY_RPM_FILE} tmp/calico/

 pushd ./tmp/calico

 rpm2cpio ${CALICO_RPM} | cpio -vid

 rpm2cpio ${CALICO_BGP_RPM} | cpio -vid

+rpm2cpio ${GO_BGP_RPM} | cpio -vid

 rpm2cpio ${CALICO_BIRD_RPM} | cpio -vid

 rpm2cpio ${CALICO_CONFD_RPM} | cpio -vid

 rpm2cpio ${CALICO_FELIX_RPM} | cpio -vid