[psfex] New upstream source (3.17.1)

Sergio Pascual sergiopr at fedoraproject.org
Thu Apr 3 22:11:35 UTC 2014


commit e797e1fd46b560f164809fa678bbfe895c1bde5f
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Apr 4 00:11:09 2014 +0200

    New upstream source (3.17.1)
    
    - Add workaround for bug #1082054 in Rawhide

 .gitignore         |    2 +
 psfex-plplot.patch |  346 +++++++++------------------------------------------
 psfex.spec         |   19 ++--
 sources            |    2 +-
 4 files changed, 75 insertions(+), 294 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c22bf3..c8775ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /psfex-3.9.1.tar.gz
+/psfex-3.17.0.tar.gz
+/psfex-3.17.1.tar.gz
diff --git a/psfex-plplot.patch b/psfex-plplot.patch
index f32183c..d5ead12 100644
--- a/psfex-plplot.patch
+++ b/psfex-plplot.patch
@@ -1,444 +1,220 @@
-diff -up psfex-3.9.1/src/cplot.c.plplot psfex-3.9.1/src/cplot.c
---- psfex-3.9.1/src/cplot.c.plplot	2010-10-25 11:53:47.000000000 -0600
-+++ psfex-3.9.1/src/cplot.c	2013-10-02 10:24:09.618326317 -0600
-@@ -527,7 +527,7 @@ int	cplot_drawloccoordgrid(wcsstruct *wc
+diff -ur psfex-3.17.0/src/cplot.c psfex-3.17.0.plplt/src/cplot.c
+--- psfex-3.17.0/src/cplot.c	2012-06-17 22:46:27.000000000 +0200
++++ psfex-3.17.0.plplt/src/cplot.c	2014-03-28 13:41:46.261925316 +0100
+@@ -527,7 +527,7 @@
  
  /* Draw meridians */
    plschr(0.0, 0.33);
 -  plwid(0);
-+  plwidth(0.0);
++  plwidth(0);
    pllsty(2);
    xmd = xmu = xdo = -0.5;
    ymd = ymu = ydo = -0.5;
-@@ -673,7 +673,7 @@ int	cplot_fwhm(fieldstruct *field)
-    PLFLT	**fwhm,
- 		clevel[CPLOT_NSHADES], cpoint[3], r[3],g[3],b[3],
- 		afwhm,fwhmmin,fwhmmax, mfwhm,dfwhm;
--   PLINT	lwid;
-+   PLFLT	lwid;
-    char		*ctype[NAXIS],
- 		str[64];
-    double	crpix[NAXIS], cdelt[NAXIS], raw[NAXIS],
-@@ -709,19 +709,19 @@ int	cplot_fwhm(fieldstruct *field)
+@@ -709,14 +709,14 @@
    ymin = 0.5;
    ymax = 100.5;
    lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
 -  plwid(lwid);
 +  plwidth(lwid);
    plfont(2);
--  plcol(15);
-+  plcol0(15);
+   plcol0(15);
    plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   sprintf(str, "#uField %s: FWHM map", field->rtcatname);
+   sprintf(str, "#uField %.24s: FWHM map", field->rtcatname);
    plschr(0.0, 1.0);
    pllab("","", str);
 -  plwid(0);
--  plcol(7);
-+  plwidth(0.0);
-+  plcol0(7);
++  plwidth(0);
+   plcol0(7);
    cplot_drawloccoordgrid(wcsout, xmin, xmax, ymin, ymax);
  
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plscmap1n(256);
- 
-   fwhmmin = BIG;
-@@ -829,8 +829,8 @@ int	cplot_fwhm(fieldstruct *field)
- 	     clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 0, distort_map, wcsptr);
+@@ -830,7 +830,7 @@
        plFree2dGrid(fwhm, nsnap2, nsnap2);
        }
--    plcol(7);
+     plcol0(7);
 -    plwid(lwid);
-+    plcol0(7);
 +    plwidth(lwid);
      cplot_drawbounds(wcs, wcsout);
      }
  
-@@ -854,7 +854,7 @@ int	cplot_fwhm(fieldstruct *field)
- 	   fwhmmin*DEG/ARCSEC,fwhmmax*DEG/ARCSEC, clevel,
- 	   CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-     }
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0, 0.5);
-   plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
-   sprintf(str, "%s", (wcs->lng == wcs->lat)?
-@@ -905,7 +905,7 @@ int	cplot_ellipticity(fieldstruct *field
-    PLFLT	**ellip,
- 		clevel[CPLOT_NSHADES], cpoint[3], r[3],g[3],b[3],
- 		aellip,ellipmin,ellipmax, mellip,dellip;
--   PLINT	lwid;
-+   PLFLT	lwid;
-    char		*ctype[NAXIS],
- 		str[64];
-    double	crpix[NAXIS], cdelt[NAXIS], raw[NAXIS],
-@@ -941,19 +941,19 @@ int	cplot_ellipticity(fieldstruct *field
+@@ -941,14 +941,14 @@
    ymin = 0.5;
    ymax = 100.5;
    lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
 -  plwid(lwid);
 +  plwidth(lwid);
    plfont(2);
--  plcol(15);
-+  plcol0(15);
+   plcol0(15);
    plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   sprintf(str, "#uField %s: ellipticity map", field->rtcatname);
+   sprintf(str, "#uField %.24s: ellipticity map", field->rtcatname);
    plschr(0.0, 1.0);
    pllab("","", str);
 -  plwid(0);
--  plcol(7);
-+  plwidth(0.0);
-+  plcol0(7);
++  plwidth(0);
+   plcol0(7);
    cplot_drawloccoordgrid(wcsout, xmin, xmax, ymin, ymax);
  
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plscmap1n(256);
- 
-   ellipmin = BIG;
-@@ -1061,8 +1061,8 @@ int	cplot_ellipticity(fieldstruct *field
- 	     clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 0, distort_map, wcsptr);
+@@ -1062,7 +1062,7 @@
        plFree2dGrid(ellip, nsnap2, nsnap2);
        }
--    plcol(7);
+     plcol0(7);
 -    plwid(lwid);
-+    plcol0(7);
 +    plwidth(lwid);
      cplot_drawbounds(wcs, wcsout);
      }
  
-@@ -1076,7 +1076,7 @@ int	cplot_ellipticity(fieldstruct *field
-   plshades(ellip, 2, CPLOT_NSHADES, NULL, 0.0, 1.0,
- 	   ellipmin,ellipmax, clevel,
- 	   CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0, 0.5);
-   plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
-   sprintf(str, "(a-b)/(a+b)");
-@@ -1123,7 +1123,7 @@ int	cplot_moffatresi(fieldstruct *field)
-    PLFLT	**resi,
- 		clevel[CPLOT_NSHADES], cpoint[3], r[3],g[3],b[3],
- 		aresi,resimin,resimax, mresi,dresi;
--   PLINT	lwid;
-+   PLFLT	lwid;
-    char		*ctype[NAXIS],
- 		str[64];
-    double	crpix[NAXIS], cdelt[NAXIS], raw[NAXIS],
-@@ -1159,19 +1159,19 @@ int	cplot_moffatresi(fieldstruct *field)
+@@ -1159,14 +1159,14 @@
    ymin = 0.5;
    ymax = 100.5;
    lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
 -  plwid(lwid);
 +  plwidth(lwid);
    plfont(2);
--  plcol(15);
-+  plcol0(15);
+   plcol0(15);
    plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   sprintf(str, "#uField %s: map of Moffat fit residuals", field->rtcatname);
+   sprintf(str, "#uField %.24s: map of Moffat fit residuals", field->rtcatname);
    plschr(0.0, 1.0);
    pllab("","", str);
 -  plwid(0);
--  plcol(7);
-+  plwidth(0.0);
-+  plcol0(7);
++  plwidth(0);
+   plcol0(7);
    cplot_drawloccoordgrid(wcsout, xmin, xmax, ymin, ymax);
  
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plscmap1n(256);
- 
-   resimin = BIG;
-@@ -1277,8 +1277,8 @@ int	cplot_moffatresi(fieldstruct *field)
- 	     clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 0, distort_map, wcsptr);
+@@ -1278,7 +1278,7 @@
        plFree2dGrid(resi, nsnap2, nsnap2);
        }
--    plcol(7);
+     plcol0(7);
 -    plwid(lwid);
-+    plcol0(7);
 +    plwidth(lwid);
      cplot_drawbounds(wcs, wcsout);
      }
  
-@@ -1292,7 +1292,7 @@ int	cplot_moffatresi(fieldstruct *field)
-   plshades(resi, 2, CPLOT_NSHADES, NULL, 0.0, 1.0,
- 	   resimin,resimax, clevel,
- 	   CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0, 0.5);
-   plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
-   plschr(0.0, 0.5);
-@@ -1342,7 +1342,7 @@ int	cplot_asymresi(fieldstruct *field)
-    PLFLT	**resi,
- 		clevel[CPLOT_NSHADES], cpoint[3], r[3],g[3],b[3],
- 		aresi,resimin,resimax, mresi,dresi;
--   PLINT	lwid;
-+   PLFLT	lwid;
-    char		*ctype[NAXIS],
- 		str[64];
-    double	crpix[NAXIS], cdelt[NAXIS], raw[NAXIS],
-@@ -1378,19 +1378,19 @@ int	cplot_asymresi(fieldstruct *field)
+@@ -1378,14 +1378,14 @@
    ymin = 0.5;
    ymax = 100.5;
    lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
 -  plwid(lwid);
 +  plwidth(lwid);
    plfont(2);
--  plcol(15);
-+  plcol0(15);
+   plcol0(15);
    plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   sprintf(str, "#uField %s: PSF asymmetry map", field->rtcatname);
+   sprintf(str, "#uField %.24s: PSF asymmetry map", field->rtcatname);
    plschr(0.0, 1.0);
    pllab("","", str);
 -  plwid(0);
--  plcol(7);
-+  plwidth(0.0);
-+  plcol0(7);
++  plwidth(0);
+   plcol0(7);
    cplot_drawloccoordgrid(wcsout, xmin, xmax, ymin, ymax);
  
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plscmap1n(256);
- 
-   resimin = BIG;
-@@ -1496,8 +1496,8 @@ int	cplot_asymresi(fieldstruct *field)
- 	     clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 0, distort_map, wcsptr);
+@@ -1497,7 +1497,7 @@
        plFree2dGrid(resi, nsnap2, nsnap2);
        }
--    plcol(7);
+     plcol0(7);
 -    plwid(lwid);
-+    plcol0(7);
 +    plwidth(lwid);
      cplot_drawbounds(wcs, wcsout);
      }
  
-@@ -1511,7 +1511,7 @@ int	cplot_asymresi(fieldstruct *field)
-   plshades(resi, 2, CPLOT_NSHADES, NULL, 0.0, 1.0,
- 	   resimin,resimax, clevel,
- 	   CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0, 0.5);
-   plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
-   plschr(0.0, 0.5);
-@@ -1555,7 +1555,7 @@ int	cplot_counts(fieldstruct *field)
-    PLFLT	**count,
- 		clevel[CPLOT_NSHADES], cpoint[3], r[3],g[3],b[3],
- 		cmin,cmax, mc,dc;
--   PLINT	lwid;
-+   PLFLT	lwid;
-    char		*ctype[NAXIS],
- 		str[64];
-    double	crpix[NAXIS], cdelt[NAXIS], raw[NAXIS],
-@@ -1592,19 +1592,19 @@ int	cplot_counts(fieldstruct *field)
+@@ -1592,14 +1592,14 @@
    ymin = 0.5;
    ymax = 100.5;
    lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
 -  plwid(lwid);
 +  plwidth(lwid);
    plfont(2);
--  plcol(15);
-+  plcol0(15);
+   plcol0(15);
    plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   sprintf(str, "#uField %s: source count map", field->rtcatname);
+   sprintf(str, "#uField %.24s: source count map", field->rtcatname);
    plschr(0.0, 1.0);
    pllab("","", str);
 -  plwid(0);
--  plcol(7);
-+  plwidth(0.0);
-+  plcol0(7);
++  plwidth(0);
+   plcol0(7);
    cplot_drawloccoordgrid(wcsout, xmin, xmax, ymin, ymax);
  
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plscmap1n(256);
- 
-   cmin = BIG;
-@@ -1665,8 +1665,8 @@ int	cplot_counts(fieldstruct *field)
-              ystep/2.0+0.5, wcs->naxisn[1]-ystep/2.0+0.5,
+@@ -1666,7 +1666,7 @@
  	     clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 0, distort_map, wcsptr);
      plFree2dGrid(count, nsnap2, nsnap2);
--    plcol(7);
+     plcol0(7);
 -    plwid(lwid);
-+    plcol0(7);
 +    plwidth(lwid);
      cplot_drawbounds(wcs, wcsout);
      }
  
-@@ -1679,7 +1679,7 @@ int	cplot_counts(fieldstruct *field)
-   plwind(0.0,1.0,cmin,cmax);
-   plshades(count, 2, CPLOT_NSHADES, NULL, 0.0, 1.0, cmin,cmax, clevel,
- 	   CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0, 0.5);
-   plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
-   plschr(0.0, 0.6);
-@@ -1714,7 +1714,7 @@ int	cplot_countfrac(fieldstruct *field)
-    PLFLT	**count,
- 		clevel[CPLOT_NSHADES], cpoint[3], r[3],g[3],b[3],
- 		cmin,cmax, mc,dc;
--   PLINT	lwid;
-+   PLFLT	lwid;
-    char		*ctype[NAXIS],
- 		str[64];
-    double	crpix[NAXIS], cdelt[NAXIS], raw[NAXIS],
-@@ -1751,19 +1751,19 @@ int	cplot_countfrac(fieldstruct *field)
+@@ -1751,14 +1751,14 @@
    ymin = 0.5;
    ymax = 100.5;
    lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
 -  plwid(lwid);
 +  plwidth(lwid);
    plfont(2);
--  plcol(15);
-+  plcol0(15);
+   plcol0(15);
    plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   sprintf(str, "#uField %s: source count fraction map", field->rtcatname);
+   sprintf(str, "#uField %.24s: source count fraction map", field->rtcatname);
    plschr(0.0, 1.0);
    pllab("","", str);
 -  plwid(0);
--  plcol(7);
-+  plwidth(0.0);
-+  plcol0(7);
++  plwidth(0);
+   plcol0(7);
    cplot_drawloccoordgrid(wcsout, xmin, xmax, ymin, ymax);
  
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plscmap1n(256);
- 
-   cmin = BIG;
-@@ -1825,8 +1825,8 @@ int	cplot_countfrac(fieldstruct *field)
-              ystep/2.0+0.5, wcs->naxisn[1]-ystep/2.0+0.5,
+@@ -1826,7 +1826,7 @@
  	     clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 0, distort_map, wcsptr);
      plFree2dGrid(count, nsnap2, nsnap2);
--    plcol(7);
+     plcol0(7);
 -    plwid(lwid);
-+    plcol0(7);
 +    plwidth(lwid);
      cplot_drawbounds(wcs, wcsout);
      }
  
-@@ -1839,7 +1839,7 @@ int	cplot_countfrac(fieldstruct *field)
-   plwind(0.0,1.0,cmin,cmax);
-   plshades(count, 2, CPLOT_NSHADES, NULL, 0.0, 1.0, cmin,cmax, clevel,
- 	   CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0, 0.5);
-   plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
-   plschr(0.0, 0.6);
-@@ -1873,7 +1873,7 @@ int	cplot_modchi2(fieldstruct *field)
-    PLFLT	**count,
- 		clevel[CPLOT_NSHADES], cpoint[3], r[3],g[3],b[3],
- 		cmin,cmax, mc,dc;
--   PLINT	lwid;
-+   PLFLT	lwid;
-    char		*ctype[NAXIS],
- 		str[64];
-    double	crpix[NAXIS], cdelt[NAXIS], raw[NAXIS],
-@@ -1911,19 +1911,19 @@ int	cplot_modchi2(fieldstruct *field)
+@@ -1911,14 +1911,14 @@
    ymin = 0.5;
    ymax = 100.5;
    lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
 -  plwid(lwid);
 +  plwidth(lwid);
    plfont(2);
--  plcol(15);
-+  plcol0(15);
+   plcol0(15);
    plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   sprintf(str, "#uField \"%s\": #gx#u2#d/d.o.f. map", field->rtcatname);
+   sprintf(str, "#uField %.24s: #gx#u2#d/d.o.f. map", field->rtcatname);
    plschr(0.0, 1.0);
    pllab("","", str);
 -  plwid(0);
--  plcol(7);
-+  plwidth(0.0);
-+  plcol0(7);
++  plwidth(0);
+   plcol0(7);
    cplot_drawloccoordgrid(wcsout, xmin, xmax, ymin, ymax);
  
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plscmap1n(256);
- 
-   cmin = BIG;
-@@ -1984,8 +1984,8 @@ int	cplot_modchi2(fieldstruct *field)
-              ystep/2.0+0.5, wcs->naxisn[1]-ystep/2.0+0.5,
+@@ -1985,7 +1985,7 @@
  	     clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 0, distort_map, wcsptr);
      plFree2dGrid(count, nsnap2, nsnap2);
--    plcol(7);
+     plcol0(7);
 -    plwid(lwid);
-+    plcol0(7);
 +    plwidth(lwid);
      cplot_drawbounds(wcs, wcsout);
      }
  
-@@ -1998,7 +1998,7 @@ int	cplot_modchi2(fieldstruct *field)
-   plwind(0.0,1.0,cmin,cmax);
-   plshades(count, 2, CPLOT_NSHADES, NULL, 0.0, 1.0, cmin,cmax, clevel,
- 	   CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0, 0.5);
-   plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
-   plschr(0.0, 0.6);
-@@ -2032,7 +2032,7 @@ int	cplot_modresi(fieldstruct *field)
-    PLFLT	**count,
- 		clevel[CPLOT_NSHADES], cpoint[3], r[3],g[3],b[3],
- 		cmin,cmax, mc,dc;
--   PLINT	lwid;
-+   PLFLT	lwid;
-    char		*ctype[NAXIS],
- 		str[64];
-    double	crpix[NAXIS], cdelt[NAXIS], raw[NAXIS],
-@@ -2070,19 +2070,19 @@ int	cplot_modresi(fieldstruct *field)
+@@ -2070,14 +2070,14 @@
    ymin = 0.5;
    ymax = 100.5;
    lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
 -  plwid(lwid);
 +  plwidth(lwid);
    plfont(2);
--  plcol(15);
-+  plcol0(15);
+   plcol0(15);
    plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   sprintf(str, "#uField \"%s\": map of residuals", field->rtcatname);
+   sprintf(str, "#uField %.24s: map of residuals", field->rtcatname);
    plschr(0.0, 1.0);
    pllab("","", str);
 -  plwid(0);
--  plcol(7);
-+  plwidth(0.0);
-+  plcol0(7);
++  plwidth(0);
+   plcol0(7);
    cplot_drawloccoordgrid(wcsout, xmin, xmax, ymin, ymax);
  
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plscmap1n(256);
- 
-   cmin = BIG;
-@@ -2143,8 +2143,8 @@ int	cplot_modresi(fieldstruct *field)
-              ystep/2.0+0.5, wcs->naxisn[1]-ystep/2.0+0.5,
+@@ -2144,7 +2144,7 @@
  	     clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 0, distort_map, wcsptr);
      plFree2dGrid(count, nsnap2, nsnap2);
--    plcol(7);
+     plcol0(7);
 -    plwid(lwid);
-+    plcol0(7);
 +    plwidth(lwid);
      cplot_drawbounds(wcs, wcsout);
      }
  
-@@ -2157,7 +2157,7 @@ int	cplot_modresi(fieldstruct *field)
-   plwind(0.0,1.0,cmin,cmax);
-   plshades(count, 2, CPLOT_NSHADES, NULL, 0.0, 1.0, cmin,cmax, clevel,
- 	   CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0, 0.5);
-   plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
-   plschr(0.0, 0.6);
diff --git a/psfex.spec b/psfex.spec
index 32da160..f8b6461 100644
--- a/psfex.spec
+++ b/psfex.spec
@@ -1,15 +1,14 @@
 Name: psfex
-Version: 3.9.1
-Release: 10%{?dist}
+Version: 3.17.1
+Release: 1%{?dist}
 Summary: Model the Point Spread Function from FITS images
 
 Group: Applications/Engineering
 License: GPLv3+
 URL: http://astromatic.iap.fr/software/%{name}
 Source0: http://www.astromatic.net/download/%{name}/%{name}-%{version}.tar.gz
-# Change plcol() to plcol0()
+# Change plwid to plwidth
 Patch0: psfex-plplot.patch
-Patch1: psfex-format-sec.patch
 BuildRequires: fftw-devel >= 3.1
 BuildRequires: atlas-devel >= 3.6.0
 BuildRequires: plplot-devel >= 5.3.1
@@ -22,19 +21,19 @@ morphological analyses.
 
 %prep
 %setup -q
-%patch0 -p1 -b .plplot
-%patch1 -p1 
+%patch0 -p1
 %if 0%{?fedora} >= 21
 # New atlas libs
 sed -i -e '/LIBS*=.*atlas/s,=.*,="-L%{_libdir}/atlas -lsatlas",' configure
 %endif
+# Workaround to bug #1082054
+touch plplot_config.h
 
 %build
-%configure
+%configure --with-atlas-libdir=%{_libdir}/atlas --enable-plplot=yes
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 %files
@@ -45,6 +44,10 @@ make DESTDIR=%{buildroot} install
 %{_datadir}/%{name}/
 
 %changelog
+* Fri Mar 28 2014 Sergio Pascual <sergiopr at fedoraproject.org> - 3.17.1-1
+- New upstream source (3.17.1)
+- Add workaround for bug #1082054 in Rawhide
+
 * Thu Dec 05 2013 Sergio Pascual <sergiopr at fedoraproject.org> - 3.9.1-10
 - Fix formar security bug (bz #1037258)
 - Spec cleanups
diff --git a/sources b/sources
index 2040e9c..7d2c91b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6198a18258c9331ac91a88c4506c5f5d  psfex-3.9.1.tar.gz
+8256c8117e8f270cf05f44fa7774ce1d  psfex-3.17.1.tar.gz


More information about the scm-commits mailing list