Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

protobuf update #2882

Merged
merged 2 commits into from Mar 6, 2017
Merged

protobuf update #2882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a056c3f
adding tqdm package
davidlange6 Mar 6, 2017
20a239b
bump protobuf version
davidlange6 Mar 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions protobuf.spec
View file
Open in desktop
@@ -1,5 +1,5 @@
### RPM external protobuf 2.6.1
Source: https://github.com/google/protobuf/releases/download/v%{realversion}/protobuf-%{realversion}.tar.gz
### RPM external protobuf 3.2.0
Source: https://github.com/google/protobuf/releases/download/v%{realversion}/protobuf-cpp-%{realversion}.tar.gz
Requires: zlib

%prep
Expand All @@ -12,10 +12,16 @@ curl -L -k -s -o ./config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;
curl -L -k -s -o ./config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
chmod +x ./config.{sub,guess}

rm -f ./gtest/build-aux/config.{sub,guess}
curl -L -k -s -o ./gtest/build-aux/config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
curl -L -k -s -o ./gtest/build-aux/config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
chmod +x ./gtest/build-aux/config.{sub,guess}

rm -f ./gmock/gtest/build-aux/config.{sub,guess}
curl -L -k -s -o ./gmock/gtest/build-aux/config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
curl -L -k -s -o ./gmock/gtest/build-aux/config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
chmod +x ./gmock/gtest/build-aux/config.{sub,guess}

rm -f ./gmock/build-aux/config.{sub,guess}
curl -L -k -s -o ./gmock/build-aux/config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
curl -L -k -s -o ./gmock/build-aux/config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
chmod +x ./gmock/build-aux/config.{sub,guess}

./configure --prefix %{i} \
--disable-static \
Expand Down
3 changes: 2 additions & 1 deletion py2-pippkgs.spec
View file
Open in desktop
@@ -1,4 +1,4 @@
### RPM external py2-pippkgs 4.0
### RPM external py2-pippkgs 5.0
## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
Source: none

Expand Down Expand Up @@ -75,6 +75,7 @@ BuildRequires: py2-mock
BuildRequires: py2-pbr
BuildRequires: py2-mpmath
BuildRequires: py2-sympy
BuildRequires: py2-tqdm

%prep

Expand Down
11 changes: 11 additions & 0 deletions py2-tqdm.spec
View file
Open in desktop
@@ -0,0 +1,11 @@
### RPM external py2-tqdm 4.11.2
## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES


%define pip_name tqdm

## IMPORT build-with-pip

%define PipPostBuild \
perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/*