Bug 1035901 - remove scrypt from dependency files
authorRyan Kelly <rfkelly@mozilla.com>
Wed, 16 Jul 2014 17:18:58 +1000
changeset 258 4c2c2cdbaea933a2f9124efb4e2b84a81dc135aa
parent 257 5df02c3a1bc221e5085d05ff8e2b6c63ecac4b56
child 259 e60b4b1ebc9e260a4f4646560fafcb4fbb404dab
push id174
push userrkelly@mozilla.com
push dateWed, 16 Jul 2014 07:19:15 +0000
bugs1035901
Bug 1035901 - remove scrypt from dependency files
KeyExchange.spec
dev-reqs.txt
prod-reqs.txt
stage-reqs.txt
--- a/KeyExchange.spec
+++ b/KeyExchange.spec
@@ -1,14 +1,14 @@
 %define name python26-keyexchange
 %define pythonname KeyExchange
 %define version 0.4
 %define unmangled_version 0.4
 %define unmangled_version 0.4
-%define release 3
+%define release 5
 
 Summary: Key Exchange server
 Name: %{name}
 Version: %{version}
 Release: %{release}
 Source0: %{pythonname}-%{unmangled_version}.tar.gz
 License: MPL
 Group: Development/Libraries
--- a/dev-reqs.txt
+++ b/dev-reqs.txt
@@ -10,10 +10,12 @@ Beaker
 python-memcached
 simplejson
 Routes
 SQLAlchemy <= 0.6.99
 MySQL-python
 WSGIProxy
 metlog-py
 metlog-cef
-scrypt
 setuptools
+# The scrypt package doesn't play nice with pypi2rpm
+# so we install it manually in the makefile.
+# scrypt
--- a/prod-reqs.txt
+++ b/prod-reqs.txt
@@ -10,10 +10,12 @@ Beaker == 1.5.4
 python-memcached == 1.53
 simplejson == 2.1.1
 Routes == 1.12.3
 SQLAlchemy == 0.6.6
 MySQL-python == 1.2.3
 WSGIProxy == 0.2.2
 metlog-py == 0.9.8
 metlog-cef == 0.2
-scrypt == 0.6.1
 setuptools == 5.4.1
+# The scrypt package doesn't play nice with pypi2rpm
+# so we install it manually in the makefile.
+# scrypt == 0.6.1
--- a/stage-reqs.txt
+++ b/stage-reqs.txt
@@ -10,10 +10,12 @@ Beaker == 1.5.4
 python-memcached == 1.53
 simplejson == 2.1.1
 Routes == 1.12.3
 SQLAlchemy == 0.6.6
 MySQL-python == 1.2.3
 WSGIProxy == 0.2.2
 metlog-py == 0.9.8
 metlog-cef == 0.2
-scrypt == 0.6.1
 setuptools == 5.4.1
+# The scrypt package doesn't play nice with pypi2rpm
+# so we install it manually in the makefile.
+# scrypt == 0.6.1