Update Gemini IRAF package to v1.14.

2 files changed, 6 insertions, 45 deletions

diff --git a/iraf.gemini/ac.iraf.gemini.patch b/iraf.gemini/ac.iraf.gemini.patch
deleted file mode 100644
index 297c7b8..0000000
--- a/iraf.gemini/ac.iraf.gemini.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur ../original/gemini.cl ./gemini.cl
---- ../original/gemini.cl	2015-11-30 20:26:51.000000000 -0300
-+++ ./gemini.cl	2016-10-03 21:17:44.000000000 -0300
-@@ -23,7 +23,9 @@
- #          Dec   7, 2015 KL	Release v1.13.1
- #
- # The latest version of the Gemini IRAF package is only compatible with
--# versions of IRAF between v2.14.1 and v2.16 in Ureka
-+# versions of IRAF between v2.14.1-v2.15.1a and v2.16 in Ureka or Astroconda
-+# -- but that requirement is enforced by installing as a conda package, so the
-+# version-check logic has been removed here (avoiding annoying pauses):
- if (defpar ("release")) {
-     if (release >= "2.16") {
-         # There appear to be several issues related to the new image template
-@@ -31,24 +33,7 @@
-         if (defvar("use_new_imt")) {
-             set use_new_imt = "no"
-         }
--        if (!access("iraf$../bin/ur-setup-real")) {
--            printf ("WARNING: The Gemini IRAF package is not compatible \n")
--            printf ("         with IRAF v2.16, unless installed using Ureka\n")
--            printf ("Tested with IRAF 2.16 from Ureka\n")
--            sleep 10
--        }
--    } else if ((release < "2.14.1") || (release > "2.15.1a")) {
--        printf ("WARNING: The Gemini IRAF package is only compatible with\n")
--        printf ("         versions of IRAF between v2.14.1 and v2.15.1a\n")
--        printf ("         and v2.16 in Ureka\n")
--        printf ("Tested with IRAF 2.16 from Ureka\n")
--        sleep 10
-     }
--} else {
--        printf ("WARNING: The Gemini IRAF package is only compatible with\n")
--        printf ("         versions of IRAF v2.14.1 and v2.16 in Ureka\n")
--        printf ("Tested with IRAF 2.16 from Ureka\n")
--        sleep 10
- }
- ;
- 
diff --git a/iraf.gemini/meta.yaml b/iraf.gemini/meta.yaml
index 506ca02..fa3c2f1 100644
--- a/iraf.gemini/meta.yaml
+++ b/iraf.gemini/meta.yaml
@@ -5,7 +5,7 @@ about:
     summary: Gemini IRAF package
 build:
     binary_relocation: False
-    number: '1'
+    number: '0'
     # These must be copied from astroconda-iraf-helpers, as conda unhelpfully
     # disallows the post-install step from depending on other packages:
     always_include_files:
@@ -13,12 +13,12 @@ build:
     - bin/ac_update_extern_pkg
 package:
     name: iraf.gemini
-    version: "1.13.1"
+    version: "1.14"
 source:
-    fn: gemini_v1131_for_iraf_2.16.tar.gz
-    url: http://astroconda-source:4440/gemini_v1131_for_iraf_2.16.tar.gz
-    patches:
-    - ac.iraf.gemini.patch
+    fn: gemini_v114.tar.gz
+    url: http://astroconda-source:4440/gemini_v114.tar.gz
+    #patches:
+    #- ac.iraf.gemini.patch
 requirements:
     build:
     - astroconda-iraf-helpers