[ARVADOS] updated: 7bba7e6419737055ad26c23c9dd3bbacb983cb87

Git user git at public.curoverse.com
Tue Jan 17 22:26:56 EST 2017


Summary of changes:
 backports/python-ciso8601/fpm-info.sh |  3 ---
 backports/python-llfuse/fpm-info.sh   |  7 ------
 backports/python-pycrypto/fpm-info.sh |  3 ---
 backports/python-pycurl/fpm-info.sh   | 44 -----------------------------------
 backports/rpm-fuse-devel/fpm-info.sh  |  5 ----
 backports/rpm-fuse/fpm-info.sh        |  5 ----
 6 files changed, 67 deletions(-)
 delete mode 100644 backports/rpm-fuse-devel/fpm-info.sh
 delete mode 100644 backports/rpm-fuse/fpm-info.sh

       via  7bba7e6419737055ad26c23c9dd3bbacb983cb87 (commit)
      from  4dd318184615c0ff83501dfa7935daea5511bb17 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7bba7e6419737055ad26c23c9dd3bbacb983cb87
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Jan 17 22:26:04 2017 -0500

    Remove references to debian7 and centos6. Also remove some hardcoded
    --iteration flags for fpm, now that #6885 is done.
    
    refs #10785

diff --git a/backports/python-ciso8601/fpm-info.sh b/backports/python-ciso8601/fpm-info.sh
index c9665be..925a375 100644
--- a/backports/python-ciso8601/fpm-info.sh
+++ b/backports/python-ciso8601/fpm-info.sh
@@ -6,6 +6,3 @@ case "$TARGET" in
         fpm_depends+=(libc6)
         ;;
 esac
-
-# FIXME: Remove this line after #6885 is done.
-fpm_args+=(--iteration 3)
diff --git a/backports/python-llfuse/fpm-info.sh b/backports/python-llfuse/fpm-info.sh
index 401a836..25ffa9e 100644
--- a/backports/python-llfuse/fpm-info.sh
+++ b/backports/python-llfuse/fpm-info.sh
@@ -1,8 +1,4 @@
 case "$TARGET" in
-    centos6)
-        build_depends+=('fuse-libs' 'fuse-devel')
-        fpm_depends+=(glibc 'fuse-libs = 2.9.2-5' 'fuse = 2.9.2-5')
-        ;;
     centos*)
         build_depends+=('fuse-devel')
         fpm_depends+=(glibc fuse-libs)
@@ -16,6 +12,3 @@ case "$TARGET" in
         fpm_depends+=(libc6 'libfuse2 > 2.9.0' 'fuse > 2.9.0')
         ;;
 esac
-
-# FIXME: Remove this line after #6885 is done.
-fpm_args+=(--iteration 3)
diff --git a/backports/python-pycrypto/fpm-info.sh b/backports/python-pycrypto/fpm-info.sh
index 65a83a0..cea7096 100644
--- a/backports/python-pycrypto/fpm-info.sh
+++ b/backports/python-pycrypto/fpm-info.sh
@@ -9,6 +9,3 @@ case "$TARGET" in
         fpm_depends+=(libc6)
         ;;
 esac
-
-# FIXME: Remove this line after #6885 is done.
-fpm_args+=(--iteration 3)
diff --git a/backports/python-pycurl/fpm-info.sh b/backports/python-pycurl/fpm-info.sh
index 5bfb010..55577cb 100644
--- a/backports/python-pycurl/fpm-info.sh
+++ b/backports/python-pycurl/fpm-info.sh
@@ -1,48 +1,4 @@
-# FIXME: Remove this line after #6885 is done.
-fpm_args+=(--iteration 3)
-
 case "$TARGET" in
-    centos6)
-            fpm_depends+=(
-                cyrus-sasl-lib
-                glibc
-                keyutils-libs
-                krb5-libs
-                libcom_err
-                libcurl
-                libidn
-                libselinux
-                libssh2
-                nspr
-                nss
-                nss-softokn-freebl
-                nss-util
-                openldap
-                openssl
-                zlib
-            ) ;;
-    debian7)
-            fpm_depends+=(
-                libc6
-                libcomerr2
-                libcurl3-gnutls
-                libgcrypt11
-                libgnutls26
-                libgpg-error0
-                libgssapi-krb5-2
-                libidn11
-                libk5crypto3
-                libkeyutils1
-                libkrb5-3
-                libkrb5support0
-                libldap-2.4-2
-                libp11-kit0
-                librtmp0
-                libsasl2-2
-                libssh2-1
-                libtasn1-3
-                zlib1g
-            ) ;;
     debian8)
             fpm_depends+=(
                 libc6
diff --git a/backports/rpm-fuse-devel/fpm-info.sh b/backports/rpm-fuse-devel/fpm-info.sh
deleted file mode 100644
index 89cdebe..0000000
--- a/backports/rpm-fuse-devel/fpm-info.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$TARGET" in
-    centos6)
-        fpm_depends+=('fuse-libs = 2.9.2-5')
-        ;;
-esac
diff --git a/backports/rpm-fuse/fpm-info.sh b/backports/rpm-fuse/fpm-info.sh
deleted file mode 100644
index 89cdebe..0000000
--- a/backports/rpm-fuse/fpm-info.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$TARGET" in
-    centos6)
-        fpm_depends+=('fuse-libs = 2.9.2-5')
-        ;;
-esac

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list