From e088bd2d5f9f65060b2172a0983ef12030f002d6 Mon Sep 17 00:00:00 2001
From: Ian Weller <ianweller@fedoraproject.org>
Date: Feb 10 2008 00:50:27 +0000
Subject: flam3 update to 2.7.9-1


---

diff --git a/.cvsignore b/.cvsignore
index 7991407..4000e00 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-flam3-2.7.8.tar.gz
+flam3-2.7.9.tar.gz
diff --git a/flam3-2.7.7-pkgconfig.patch b/flam3-2.7.7-pkgconfig.patch
deleted file mode 100644
index dc3ee5e..0000000
--- a/flam3-2.7.7-pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- flam3-2.7.7/flam3.pc.in.orig	2007-10-30 16:30:53.000000000 +0900
-+++ flam3-2.7.7/flam3.pc.in	2008-01-17 17:00:42.000000000 +0900
-@@ -6,6 +6,6 @@
- Name: flam3
- Description: Renders and animates fractal flames and manipulates their genetic codes
- Version: @VERSION@
--Requires: libpng12 >= 1.0
--Libs: -L${libdir} -lflam3 @WIN32_LIBS@
--Cflags: -I@INCLUDEDIR@ @WIN32_CFLAGS@
-+Requires: libpng12 >= 1.0 libxml-2.0
-+Libs: -L${libdir} -lflam3 -ljpeg -lpthread
-+Cflags: -I${includedir}
diff --git a/flam3-2.7.8-remove-config.h.patch b/flam3-2.7.8-remove-config.h.patch
deleted file mode 100644
index 72ee840..0000000
--- a/flam3-2.7.8-remove-config.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- flam3-2.7.8/flam3-genome.c.orig	2008-01-27 07:22:18.000000000 +0900
-+++ flam3-2.7.8/flam3-genome.c	2008-01-31 16:21:13.000000000 +0900
-@@ -22,6 +22,7 @@
- 
- #include "private.h"
- #include "isaacs.h"
-+#include "config.h"
- 
- int verbose;
- 
---- flam3-2.7.8/flam3.c.orig	2008-01-27 07:22:18.000000000 +0900
-+++ flam3-2.7.8/flam3.c	2008-01-31 16:07:11.000000000 +0900
-@@ -23,6 +23,7 @@
- 
- #include "private.h"
- #include "img.h"
-+#include "config.h"
- #include <limits.h>
- #include <math.h>
- #include <stdint.h>
---- flam3-2.7.8/private.h.orig	2007-10-30 16:30:53.000000000 +0900
-+++ flam3-2.7.8/private.h	2008-01-31 16:07:52.000000000 +0900
-@@ -35,8 +35,6 @@
- #define basename(x) strdup(x)
- #endif
- 
--#include "config.h"
--
- #define EPS (1e-10)
- #define CMAP_SIZE 256
- #define CMAP_SIZE_M1 255
diff --git a/flam3.spec b/flam3.spec
index 2a60062..0aa6178 100644
--- a/flam3.spec
+++ b/flam3.spec
@@ -1,15 +1,17 @@
 Name:           flam3
-Version:        2.7.8
-Release:        4%{?dist}
+Version:        2.7.9
+Release:        1%{?dist}
 Summary:        Programs to generate and render cosmic recursive fractal flames
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.flam3.com/
 Source0:        http://www.flam3.com/%{name}-%{version}.tar.gz
-Patch0:         flam3-2.7.7-pkgconfig.patch
-Patch1:         flam3-2.7.8-config.h.in.patch
-Patch2:         flam3-2.7.8-remove-config.h.patch
+Patch0:         flam3-2.7.8-config.h.in.patch
+#Patch:         flam3-2.7.7-pkgconfig.patch
+  # Fixed by upstream at 2.7.9
+#Patch:         flam3-2.7.8-remove-config.h.patch
+  # Fixed by upstream at 2.7.9
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -42,9 +44,9 @@ package contains a header file for C, a static library, and a pkgconfig file.
 
 %prep
 %setup -q
-%patch0 -p1 -b .pkgconfig
-%patch1 -p1 -b .config_h_in
-%patch2 -p1 -b .remove_config_h
+%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
 chmod 644 *.c
 
@@ -88,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Feb 09 2008 Ian Weller <ianweller@gmail.com> 2.7.9-1
+- Upstream updated
+- Upstream made changes based on our patches, so removed now redundant patches
+
 * Fri Feb 01 2008 Ian Weller <ianweller@gmail.com> 2.7.8-4
 - Made patch commands less confusing
 
diff --git a/sources b/sources
index f8ad4bf..0e2a8e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61f6bd1fee26a6be0a87c61b3c0d1c3d  flam3-2.7.8.tar.gz
+72ea2bb1b16e750f3f01eaa5c06c89ab  flam3-2.7.9.tar.gz