packages: mtpaint/mtpaint.spec, mtpaint/mtpaint-flags.patch (NEW) - fix com...

[sparky]

Author: sparky                       Date: Mon Oct 12 21:53:25 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix compile flags

---- Files affected:
packages/mtpaint:
   mtpaint.spec (1.7 -> 1.8) , mtpaint-flags.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mtpaint/mtpaint.spec
diff -u packages/mtpaint/mtpaint.spec:1.7 packages/mtpaint/mtpaint.spec:1.8
--- packages/mtpaint/mtpaint.spec:1.7	Mon Oct 12 23:18:40 2009
+++ packages/mtpaint/mtpaint.spec	Mon Oct 12 23:53:20 2009
@@ -9,6 +9,7 @@
 Source0:	http://dl.sourceforge.net/mtpaint/%{name}-%{version}.tar.bz2
 # Source0-md5:	fbe34eb25f96b6092403115f1f6ab387
 Source1:	%{name}.desktop
+Patch0:		%{name}-flags.patch
 URL:		http://mtpaint.sourceforge.net/
 BuildRequires:	gettext-devel
 BuildRequires:	giflib-devel
@@ -33,12 +34,17 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure man pod intl jp2 \
 	--mandir=%{_mandir}/man1
-echo 'LDFLAG += %{rpmldflags}' >> _conf.txt
-echo 'CFLAG  += %{rpmcflags}'  >> _conf.txt
+cat >> _conf.txt <<'EOF'
+LDFLAG = %{rpmldflags}
+CFLAG += %{rpmcflags}
+CC = %{__cc} -Wall -Wno-pointer-sign
+EOF
+
 %{__make}
 
 %install
@@ -83,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2009/10/12 21:53:20  sparky
+- fix compile flags
+
 Revision 1.7  2009/10/12 21:18:40  evil
 - updated to 3.31
 - license changed to GPL v3+

================================================================
Index: packages/mtpaint/mtpaint-flags.patch
diff -u /dev/null packages/mtpaint/mtpaint-flags.patch:1.1
--- /dev/null	Mon Oct 12 23:53:25 2009
+++ packages/mtpaint/mtpaint-flags.patch	Mon Oct 12 23:53:20 2009
@@ -0,0 +1,52 @@
+diff -ur mtpaint-3.31.orig/configure mtpaint-3.31/configure
+--- mtpaint-3.31.orig/configure	2009-04-15 20:46:26.000000000 +0200
++++ mtpaint-3.31/configure	2009-10-12 23:46:03.784369172 +0200
+@@ -482,7 +482,7 @@
+ 		AS_NEEDED="-Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs"
+ 	fi
+ 
+-	L_EX=$AS_NEEDED
++	#L_EX=$AS_NEEDED
+ 	I_EX=$HAVE_FUNCS
+ 	if [ "$NGIF" != "NO" ]
+ 	then
+@@ -552,7 +552,7 @@
+ 
+ 	if [ "$DEBUG" = NO ]
+ 	then
+-		GTK_LIB="$GTK_LIB -s"
++		GTK_LIB="$GTK_LIB"
+ 	else
+ 		I_EX="$I_EX -ggdb"
+ 	fi
+@@ -595,7 +595,7 @@
+ 
+ 	I_EX="$I_EX -DVERSION=\"\\\"$MT_VERSION\"\\\""
+ 	GTK_INCLUDE="$GTK_INCLUDE $I_EX"
+-	echo "LDFLAG = $L_EX $GTK_LIB" >> $GTK_FILE
++	echo "LIB = $L_EX $GTK_LIB" >> $GTK_FILE
+ 
+ 	if [ "$CFLAG" ]
+ 	then
+diff -ur mtpaint-3.31.orig/src/Makefile mtpaint-3.31/src/Makefile
+--- mtpaint-3.31.orig/src/Makefile	2008-11-08 18:31:59.000000000 +0100
++++ mtpaint-3.31/src/Makefile	2009-10-12 23:40:38.721067506 +0200
+@@ -1,7 +1,8 @@
+ include ../_conf.txt
+ 
+ CFLAGS = $(CFLAG)
+-LDFLAGS = $(LDFLAG) $(GLIB_LIB)
++LDFLAGS = $(LDFLAG)
++LIBS = $(LIB) $(GLIB_LIB)
+ 
+ BIN = mtpaint
+ 
+@@ -10,7 +11,7 @@
+ 	toolbar.o channels.o csel.o shifter.o spawn.o font.o fpick.o icons.o cpick.o
+ 
+ $(BIN): main.o $(OBJS)
+-	$(CC) main.o $(OBJS) -o $(BIN) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) main.o $(OBJS) -o $(BIN) $(LIBS)
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c -o $*.o $*.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mtpaint/mtpaint.spec?r1=1.7&r2=1.8&f=u