rpms/cinepaint/devel cinepaint-0.22-multilib.patch,1.2,1.3

[Chauvet (kwizart)]

Author: kwizart

Update of /cvs/pkgs/rpms/cinepaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31308

Modified Files:
	cinepaint-0.22-multilib.patch 
Log Message:
more multilib improvements


cinepaint-0.22-multilib.patch:

Index: cinepaint-0.22-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint-0.22-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cinepaint-0.22-multilib.patch	7 Mar 2008 22:20:26 -0000	1.2
+++ cinepaint-0.22-multilib.patch	7 Mar 2008 23:03:26 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up cinepaint-0.22-1/cinepainttool.in.multilib cinepaint-0.22-1/cinepainttool.in
---- cinepaint-0.22-1/cinepainttool.in.multilib	2008-03-07 21:48:32.000000000 +0100
-+++ cinepaint-0.22-1/cinepainttool.in	2008-03-07 21:52:08.000000000 +0100
+--- cinepaint-0.22-1/cinepainttool.in.multilib	2008-03-07 23:19:19.000000000 +0100
++++ cinepaint-0.22-1/cinepainttool.in	2008-03-07 23:36:50.000000000 +0100
 @@ -71,8 +71,8 @@ if test $# -eq 0; then
  fi
  
@@ -29,7 +29,28 @@
 +      libdirs="-L`pkg-config --variable libdir gtk+-2.0`"
        for i in $gtk_libs ; do
 -        if test $i != -L at libdir@ ; then
-+        if test $i != -L`pkg-config --variable libdir gtk+-2.0` ; then
++        if test $i != "-L`pkg-config --variable libdir gtk+-2.0`" ; then
            if test -z "$my_gtk_libs" ; then
              my_gtk_libs="$i"
            else
+@@ -202,9 +202,9 @@ while test $# -gt 0; do
+       fi 
+       glib_libs="$glib_ldflags `echo $gtk_libs | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`"
+       my_glib_libs=
+-      libdirs=-L at libdir@
++      libdirs=-L`pkg-config --variable libdir gtk+-2.0`
+       for i in $glib_libs ; do
+-        if test $i != -L at libdir@ ; then
++        if test $i != -L`pkg-config --variable libdir gtk+-2.0` ; then
+           if test -z "$my_glib_libs" ; then
+             my_glib_libs="$i"
+           else
+@@ -212,7 +212,7 @@ while test $# -gt 0; do
+           fi
+         fi
+       done
+-      echo -L at libdir@ -lcinepaint -lcinepaintHalf $my_glib_libs
++      echo -L`pkg-config --variable libdir gtk+-2.0` -lcinepaint -lcinepaintHalf $my_glib_libs
+       ;;
+     --install-dir)
+       echo "$plug_in_dir/plug-ins"