rpms/GraphicsMagick/EL-6 .cvsignore, 1.11, 1.12 GraphicsMagick.spec, 1.31, 1.32 sources, 1.11, 1.12 GraphicsMagick-CVE-2009-1882.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25444

Modified Files:
	.cvsignore GraphicsMagick.spec sources 
Removed Files:
	GraphicsMagick-CVE-2009-1882.patch 
Log Message:
* Mon Mar 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.3.12-1
- GraphicsMagick-1.3.12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	18 Sep 2009 01:24:59 -0000	1.11
+++ .cvsignore	7 Jul 2010 17:11:21 -0000	1.12
@@ -1 +1 @@
-GraphicsMagick-1.3.7.tar.lzma
+GraphicsMagick-1.3.12.tar.lzma


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-6/GraphicsMagick.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- GraphicsMagick.spec	29 Dec 2009 00:04:41 -0000	1.31
+++ GraphicsMagick.spec	7 Jul 2010 17:11:22 -0000	1.32
@@ -1,8 +1,8 @@
 
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.3.7
-Release: 4%{?dist}
+Version: 1.3.12
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
@@ -27,12 +27,6 @@ BuildRequires: perl-devel
 %endif
 BuildRequires: zlib-devel
 
-# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/xwindow.c.diff?r1=1.230;r2=1.232'
-# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/xwindow.c.diff?r1=1.232;r2=1.233'
-# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/memory.c.diff?r1=1.54;r2=1.55
-# http://cvs.graphicsmagick.org/cgi-bin/cvsweb.cgi/GraphicsMagick/magick/memory.h.diff?r1=1.16;r2=1.17'
-Patch100: GraphicsMagick-CVE-2009-1882.patch
-
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
 based on ImageMagick 5.5.2, but which has undergone significant re-work by
@@ -101,8 +95,6 @@ however.
 %prep
 %setup -q
 
-%patch100 -p1 -b .CVE-2009-1882
-
 iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
 mv -f ChangeLog.utf8 ChangeLog
 
@@ -120,12 +112,14 @@ sed -i.rpath -e 's|"/lib /usr/lib|"/%{_l
            --with-perl \
            --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix}" \
            --with-threads \
-           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
            --with-wmf \
            --with-x \
            --with-xml \
            --without-dps \
-           --without-gslib
+           --without-gslib \
+           --with-windows-font-dir=%{_datadir}/fonts/msttcorefonts \
+           --with-gs-font-dir=%{_datadir}/fonts/default/ghostscript 
+
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} perl-build
@@ -192,10 +186,10 @@ cat >%{buildroot}%{_includedir}/Graphics
 EOF
 
 
-#check
-## FIXME: seems to need -fno-var-tracking-assignments in a couple of places
-## else, takes a *very* long time
-#make check
+%check
+## expect (at least) 6 FAIL, one PerlMagic, 5 in Magick++/demo
+## TODO: wtf? :) -- Rex
+make check ||:
 
 
 %clean
@@ -257,6 +251,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.3.12-1
+- GraphicsMagick-1.3.12
+
+* Tue Feb 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.3.11-1
+- GraphicsMagick-1.3.11
+
 * Mon Dec 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-4
 - CVE-2009-1882 (#503017)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	18 Sep 2009 01:25:00 -0000	1.11
+++ sources	7 Jul 2010 17:11:22 -0000	1.12
@@ -1 +1 @@
-8a1ccf10d15816206426a9e716def9ac  GraphicsMagick-1.3.7.tar.lzma
+1b91c37daa9640440a91a83727607269  GraphicsMagick-1.3.12.tar.lzma


--- GraphicsMagick-CVE-2009-1882.patch DELETED ---