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 c9665be0967d205d16e28f453df94bb22cb4f223..925a3757a25b449bab2dd67a2d4f2b521b948d62 100644 (file)
--- 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 401a8367a7bf2c2a6bc9aeed1fa0b0cd156c6efe..25ffa9ea8cca8bd455c51fbf089ff0f7475d7b84 100644 (file)
--- 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 65a83a06c7496c5da09315807965272b8d0ff460..cea7096395b8a5556d377f8f2e82732c8cf49f3f 100644 (file)
--- 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 5bfb010f0e56a3391146482fa5b9d5b51658ee02..55577cb706417c57a7faaac72c2da7d48f8a0f45 100644 (file)
--- 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 (file)
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 (file)
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