[gimp-fourier-plugin/f15] Fix build patch and spec formatting.

[Fabian Deutsch]

commit c8639a448e9c81de7a8567376a9fc2813aa7492e
Author: Fabian Deutsch <fabian.deutsch at gmx.de>
Date:   Wed Aug 31 21:15:15 2011 +0200

    Fix build patch and spec formatting.
    
    Signed-off-by: Fabian Deutsch <fabian.deutsch at gmx.de>

 .gitignore                      |    1 +
 gimp-fourier-plugin.build.patch |   31 ++++++++-----------------------
 gimp-fourier-plugin.spec        |   18 +++++++++++-------
 sources                         |    2 +-
 4 files changed, 21 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7ce8f8..79b8231 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 fourier-0.3.2.tar.gz
+/fourier-0.4.1.tar.gz
diff --git a/gimp-fourier-plugin.build.patch b/gimp-fourier-plugin.build.patch
index af3d465..6e619b5 100644
--- a/gimp-fourier-plugin.build.patch
+++ b/gimp-fourier-plugin.build.patch
@@ -1,25 +1,10 @@
-diff -u fourier-0.3.2.orig/Makefile fourier-0.3.2/Makefile
---- fourier-0.3.2.orig/Makefile	2007-12-17 19:27:18.000000000 +0100
-+++ fourier-0.3.2/Makefile	2009-01-25 19:00:59.000000000 +0100
-@@ -3,9 +3,9 @@
+--- fourier-0.4.1.orig/Makefile	2010-02-13 19:56:37.000000000 +0100
++++ fourier-0.4.1/Makefile	2011-08-31 21:14:16.344929003 +0200
+@@ -2,7 +2,6 @@
+ GIMPTOOL=gimptool-2.0
  PLUGIN_BUILD=$(GIMPTOOL) --build
  PLUGIN_INSTALL=$(GIMPTOOL) --install-bin
- GCC=g++
--LIBS=$(shell pkg-config fftw3 --libs)
--CFLAGS=-O2 $(shell pkg-config fftw3 --cflags)
--VERSION=0.3.0
-+LIBS=$(shell pkg-config fftw3 gimp-2.0 --libs)
-+CFLAGS=-O2 $(shell pkg-config fftw3 gimp-2.0 --cflags)
-+VERSION=0.3.2
- DIR=fourier-$(VERSION)
- 
- export
-@@ -21,7 +21,7 @@
- all: fourier
- 
- fourier: fourier.c
--	$(PLUGIN_BUILD) fourier.c  
-+	$(CC) $(CFLAGS) $(LIBS) -o fourier fourier.c  
- 
- install: fourier
- 	$(PLUGIN_INSTALL) fourier
+-GCC=g++
+ LIBS=$(shell pkg-config fftw3 gimp-2.0 --libs)
+ CFLAGS=-O2 $(shell pkg-config fftw3 gimp-2.0 --cflags)
+ VERSION=0.4.1
diff --git a/gimp-fourier-plugin.spec b/gimp-fourier-plugin.spec
index 4688182..ff21e28 100644
--- a/gimp-fourier-plugin.spec
+++ b/gimp-fourier-plugin.spec
@@ -1,18 +1,18 @@
 Name:		gimp-fourier-plugin
-Version:	0.3.2
-Release:	5%{?dist}
+Version:	0.4.1
+Release:	1%{?dist}
 Summary:	A simple plug-in to do fourier transform on your image
 
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		http://people.via.ecp.fr/~remi/soft/gimp/gimp_plugin_en.php3
 Source0:	http://people.via.ecp.fr/~remi/soft/gimp/fourier-%{version}.tar.gz
-# patch0 sent upstream via email. mentioned gnomebug #568351
 Patch0:		gimp-fourier-plugin.build.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gimp-devel
 BuildRequires:	fftw3-devel
+BuildRequires:	dos2unix
 Requires:	gimp
 
 
@@ -26,15 +26,16 @@ this plugin is to be able to work with the transformed image inside GIMP.
 %patch0 -p1 -b .build
 
 # Fix for wrong-file-end-of-line-encoding problem
-%{__sed} -i 's/\r//' README
-%{__sed} -i 's/\r//' gpl.txt
+dos2unix README
+dos2unix README.Moire
 
 # Fix utf-8 encoding
 iconv -f ISO-8859-1 -t UTF-8 README > README.utf8
+iconv -f ISO-8859-1 -t UTF-8 README.Moire > README.Moire.utf8
 
 
 %build
-export CC="gcc %{optflags}"
+export GCC="gcc %{optflags}"
 make %{?_smp_mflags}
 
 
@@ -50,11 +51,14 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README.utf8 gpl.txt
+%doc README.utf8 README.Moire.utf8
 %{_libdir}/gimp/2.0/plug-ins/fourier
 
 
 %changelog
+* Wed Aug 31 2011 Fabian Deutsch <fabiand at fedoraproject.org> - 0.4.1-1
+- Update to 0.4.1
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index cba593f..832ba78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ee626241bcdb5c72ef5df30117e0123  fourier-0.3.2.tar.gz
+b3bc577d772f9134f547d269964bcb0e  fourier-0.4.1.tar.gz