rpms/metapixel/FC-3 metapixel-makefile.patch, 1.1, 1.2 metapixel.spec, 1.1, 1.2

[Andreas Thienemann (ixs)]

Author: ixs

Update of /cvs/extras/rpms/metapixel/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15656

Modified Files:
	metapixel-makefile.patch metapixel.spec 
Log Message:
* Mon May 22 2006 Andreas Thienemann <andreas at bawue.net> 1.0.1-4
- bump


metapixel-makefile.patch:

Index: metapixel-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/metapixel/FC-3/metapixel-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metapixel-makefile.patch	26 Apr 2006 16:04:34 -0000	1.1
+++ metapixel-makefile.patch	21 May 2006 22:59:22 -0000	1.2
@@ -1,6 +1,6 @@
 --- metapixel-1.0.1/Makefile.makefile	2006-02-19 22:30:56.000000000 +0100
-+++ metapixel-1.0.1/Makefile	2006-04-26 04:18:27.000000000 +0200
-@@ -1,9 +1,9 @@
++++ metapixel-1.0.1/Makefile	2006-05-22 00:35:49.000000000 +0200
+@@ -1,21 +1,18 @@
 -PREFIX = /usr/local
 +PREFIX = /usr
  INSTALL = install
@@ -12,7 +12,22 @@
  
  VERSION = 1.0.1
  
-@@ -46,12 +46,13 @@
+ #DEBUG = -g
+-OPTIMIZE = -O2
++#OPTIMIZE = -O2
+ #PROFILE = -pg
+ 
+-MACOS_LDOPTS = -L/sw/lib
+-MACOS_CCOPTS = -I/sw/include
+-
+-LDOPTS = $(MACOS_LDOPTS) -L/usr/X11R6/lib $(PROFILE) $(DEBUG)
+-CCOPTS = $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
++LDOPTS = -L/usr/X11R6/lib $(LDFLAGS) $(PROFILE) $(DEBUG) 
++CCOPTS = -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Wall $(OPTIMIZE) $(DEBUG) $(CFLAGS) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
+ CC = gcc
+ #LIBFFM = -lffm
+ 
+@@ -46,12 +43,13 @@
  	$(CC) $(CCOPTS) -c $<
  
  install : metapixel metapixel.1


Index: metapixel.spec
===================================================================
RCS file: /cvs/extras/rpms/metapixel/FC-3/metapixel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metapixel.spec	26 Apr 2006 16:04:34 -0000	1.1
+++ metapixel.spec	21 May 2006 22:59:22 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A Photomosaic Generator
 Name: metapixel
 Version: 1.0.1
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Multimedia
 Source0: http://www.complang.tuwien.ac.at/~schani/metapixel/metapixel-%{version}.tar.gz
@@ -23,7 +23,7 @@
 %patch0 -p1 -b .makefile
 
 %build
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
 rm -rf %{buildroot}
@@ -44,6 +44,12 @@
 
 
 %changelog
+* Mon May 22 2006 Andreas Thienemann <andreas at bawue.net> 1.0.1-4
+- bump
+
+* Mon May 22 2006 Andreas Thienemann <andreas at bawue.net> 1.0.1-3
+- Patched Makefile to honor %%{optflags}, fixing #192620
+
 * Wed Apr 26 2006 Andreas Thienemann <andreas at bawue.net> 1.0.1-2
 - Fixed manpage perms