diff --git a/.cvsignore b/.cvsignore index ffd829d..070dc83 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -flam3-2.7.11.tar.gz +flam3-2.7.12.tar.gz diff --git a/flam3-2.7.8-config.h.in.patch b/flam3-2.7.8-config.h.in.patch deleted file mode 100644 index 5c2dd33..0000000 --- a/flam3-2.7.8-config.h.in.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- flam3-2.7.8/config.h.in.orig 2008-01-28 23:16:53.000000000 -0600 -+++ flam3-2.7.8/config.h.in 2008-01-28 23:17:05.000000000 -0600 -@@ -4,10 +4,10 @@ - #undef HAVE_DLFCN_H - - /* Have 64-bit __sync_bool_compare_and_swap() and friends. */ --#undef HAVE_GCC_64BIT_ATOMIC_OPS -+/* #undef HAVE_GCC_64BIT_ATOMIC_OPS */ - - /* Have 32-bit __sync_bool_compare_and_swap() and friends. */ --#undef HAVE_GCC_ATOMIC_OPS -+/* #undef HAVE_GCC_ATOMIC_OPS */ - - /* Define to 1 if you have the header file. */ - #undef HAVE_INTTYPES_H diff --git a/flam3.spec b/flam3.spec index 7767d3a..bd45825 100644 --- a/flam3.spec +++ b/flam3.spec @@ -1,5 +1,5 @@ Name: flam3 -Version: 2.7.11 +Version: 2.7.12 Release: 1%{?dist} Summary: Programs to generate and render cosmic recursive fractal flames @@ -7,7 +7,8 @@ Group: Applications/Multimedia License: GPLv2+ URL: http://www.flam3.com/ Source0: http://www.flam3.com/%{name}-%{version}.tar.gz -Patch0: flam3-2.7.8-config.h.in.patch +#Patch0: flam3-2.7.8-config.h.in.patch + # Fixed with GCC 4.3 #Patch: flam3-2.7.7-pkgconfig.patch # Fixed by upstream at 2.7.9 #Patch: flam3-2.7.8-remove-config.h.patch @@ -44,7 +45,7 @@ package contains a header file for C, a static library, and a pkgconfig file. %prep %setup -q -%patch0 -p1 -b .config_h_in +#%patch0 -p1 -b .config_h_in #%patch1 -p1 -b .pkgconfig #%patch2 -p1 -b .remove_config_h sed -i.flags -e 's|-O3 -ffast-math||' Makefile.in @@ -90,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 25 2008 Ian Weller 2.7.12-1 +- Upstream updated + * Wed Apr 09 2008 Ian Weller 2.7.11-1 - Upstream updated diff --git a/sources b/sources index c3bcd76..9e63423 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2924621d87a6b9e02b753d67d2db62a flam3-2.7.11.tar.gz +d06632c0fdfb90f90b00c68511a4013e flam3-2.7.12.tar.gz