rpms/GREYCstoration/F-7 GREYCstoration-2.8-fixmakefile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 GREYCstoration.spec, 1.3, 1.4 sources, 1.4, 1.5 GREYCstoration-2.5.2-fixmakefile.patch, 1.1, NONE

[Marc Bradshaw (deebs)]

Author: deebs

Update of /cvs/pkgs/rpms/GREYCstoration/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10796/F-7

Modified Files:
	.cvsignore GREYCstoration.spec sources 
Added Files:
	GREYCstoration-2.8-fixmakefile.patch 
Removed Files:
	GREYCstoration-2.5.2-fixmakefile.patch 
Log Message:
new upstream version


GREYCstoration-2.8-fixmakefile.patch:

--- NEW FILE GREYCstoration-2.8-fixmakefile.patch ---
--- GREYCstoration-2.8.orig/src/Makefile	2008-03-10 20:31:56.000000000 +1100
+++ GREYCstoration-2.8/src/Makefile	2008-03-13 15:24:32.000000000 +1100
@@ -36,21 +36,22 @@
 CIMG_XRANDR_FLAGS = -Dcimg_use_xrandr -lXrandr
 
 # Uncomment to enable native support for PNG image files, using the PNG library.
-#CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz
+CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz
 
 # Uncomment to enable native support for JPEG image files, using the JPEG library.
-#CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg
+CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg
 
 # Uncomment to enable native support for TIFF image files, using the TIFF library.
-#CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff
+CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff
 
 # Uncomment to enable native support of most classical image file formats, using the Magick++ library.
 #CIMG_MAGICK_FLAGS = -Dcimg_use_magick `Magick++-config --cppflags` `Magick++-config --cxxflags` `Magick++-config --ldflags` `Magick++-config --libs`
 
 # Uncomment to enable faster Discrete Fourier Transform computation, using the FFTW3 library
-#CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
+CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
 
 EXTRA_FLAGS = $(CIMG_X11_FLAGS) $(CIMG_STRICT_FLAGS) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
+ARCHFLAGS = $(CIMG_X11_FLAGS) $(CIMG_STRICT_FLAGS) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
 
 # Compilation rules
 .cpp:
@@ -58,7 +59,6 @@
 	@echo "** Compiling '$* ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | grep version`'"
 	@echo
 	$(CC) -o $* $< $(CFLAGS) $(LDFLAGS) $(ARCHFLAGS)
-	strip $*
 menu:
 	@echo
 	@echo "CImg Library $(CIMG_VERSION) : Examples"
@@ -93,7 +93,6 @@
 	@echo "** Compiling 'greycstoration4gimp ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | grep version`'"
 	@echo
 	$(CC) -o greycstoration4gimp greycstoration4gimp.cpp `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread -O3 $(CFLAGS)
-	strip greycstoration4gimp
 # Linux/Mac OSX targets
 linux:
 	make "ARCHFLAGS=$(EXTRA_FLAGS)" all


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GREYCstoration/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jan 2008 04:57:47 -0000	1.3
+++ .cvsignore	13 Mar 2008 22:35:09 -0000	1.4
@@ -1 +1 @@
-GREYCstoration-2.6.zip
+GREYCstoration-2.8.zip


Index: GREYCstoration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GREYCstoration/F-7/GREYCstoration.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GREYCstoration.spec	15 Jan 2008 11:37:23 -0000	1.3
+++ GREYCstoration.spec	13 Mar 2008 22:35:09 -0000	1.4
@@ -1,13 +1,13 @@
 Name:           GREYCstoration
-Version:        2.6
-Release:        2%{?dist}
+Version:        2.8
+Release:        1%{?dist}
 Summary:        An image denoising and interpolation tool
 Group:          Applications/Multimedia
 License:        CeCILL
 URL:            http://www.greyc.ensicaen.fr/~dtschump/greycstoration/index.html
-Source0:        http://www.greyc.ensicaen.fr/~dtschump/greycstoration/data/%{name}-%{version}.zip
+Source0:        http://dl.sf.net/cimg/%{name}-%{version}.zip
 Source1:        %{name}.png
-Patch0:         GREYCstoration-2.5.2-fixmakefile.patch
+Patch0:         GREYCstoration-2.8-fixmakefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gimp-devel gimp
 BuildRequires:  desktop-file-utils
@@ -136,6 +136,12 @@
 %{_bindir}/%{name}_gui.tcl
 
 %changelog
+* Thu Mar 13 2008 Marc Bradshaw <packages at marcbradshaw.co.uk> 2.8-1
+- New upstream version
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.6-3
+- Autorebuild for GCC 4.3
+
 * Tue Jan 15 2008 Marc Bradshaw <packages at marcbradshaw.co.uk> 2.6-2
 - New upstream version, testing 64 bit build issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GREYCstoration/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2008 11:37:23 -0000	1.4
+++ sources	13 Mar 2008 22:35:09 -0000	1.5
@@ -1 +1 @@
-e7814b47a1dcf7fc7b8f694d9d1bbd72  GREYCstoration-2.6.zip
+66b5e1467ab6f0d61b142e4604f6a231  GREYCstoration-2.8.zip


--- GREYCstoration-2.5.2-fixmakefile.patch DELETED ---