rpms/cinepaint/devel cinepaint-0.22-multilib.patch, 1.1, 1.2 cinepaint.spec, 1.9, 1.10

Chauvet (kwizart) fedora-extras-commits at redhat.com
Fri Mar 7 22:20:35 UTC 2008


Author: kwizart

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

Modified Files:
	cinepaint-0.22-multilib.patch cinepaint.spec 
Log Message:
Fix for multilib


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cinepaint-0.22-multilib.patch	7 Mar 2008 21:39:36 -0000	1.1
+++ cinepaint-0.22-multilib.patch	7 Mar 2008 22:20:26 -0000	1.2
@@ -1,15 +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
-@@ -4,7 +4,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=no
- datarootdir=@datarootdir@
--plug_in_dir=@programplugindir@
-+plug_in_dir=`pkg-config --variable programplugindir cinepaint-gtk`
- programdotdir=@programdotdir@
- programdatadir=@programdatadir@
- datadir=@datadir@
 @@ -71,8 +71,8 @@ if test $# -eq 0; then
  fi
  
@@ -35,10 +26,10 @@
      --libs | --libs-nocinepaintui)
        my_gtk_libs=
 -      libdirs=-L at libdir@
-+      libdirs="-L`pkg-config --variable libdir cinepaint-gtk`"
++      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 cinepaint-gtk) ; 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


Index: cinepaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cinepaint.spec	7 Mar 2008 21:39:36 -0000	1.9
+++ cinepaint.spec	7 Mar 2008 22:20:26 -0000	1.10
@@ -6,7 +6,7 @@
 
 Name:           cinepaint
 Version:        %(echo %{cinever} |sed 's|-|.|')
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        CinePaint is a tool for manipulating images
 
 Group:          Applications/Multimedia
@@ -161,6 +161,8 @@
 ${RPM_BUILD_ROOT}%{_datadir}/applications/cinepaint.desktop
 
 # Fix multilib cinepaint-devel
+sed -i -e 's|plug_in_dir=%{_libdir}/cinepaint/%{cinever}|plug_in_dir="$(pkg-config --variable programplugindir cinepaint-gtk)"|' \
+  ${RPM_BUILD_ROOT}%{_bindir}/cinepainttool
 touch -r ChangeLog ${RPM_BUILD_ROOT}%{_bindir}/cinepainttool
 
 




More information about the fedora-extras-commits mailing list