rpms/xffm/devel xffm-4.2.0-rpath.patch, NONE, 1.1 xffm-4.2.1-static.patch, NONE, 1.1 xffm.spec, 1.3, 1.4

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17914

Modified Files:
	xffm.spec 
Added Files:
	xffm-4.2.0-rpath.patch xffm-4.2.1-static.patch 
Log Message:
Synced with spec in core devel
Added patch to fix compile on devel
Readded rpath patch


xffm-4.2.0-rpath.patch:

--- NEW FILE xffm-4.2.0-rpath.patch ---
--- xffm-4.2.0/configure.orig	2005-01-09 13:54:20.000000000 +0100
+++ xffm-4.2.0/configure	2005-01-28 14:12:56.000000000 +0100
@@ -38678,7 +38678,7 @@
 
             echo "$as_me:$LINENO: checking DBH_LIBS" >&5
 echo $ECHO_N "checking DBH_LIBS... $ECHO_C" >&6
-            DBH_LIBS=`$PKG_CONFIG --libs "dbh-1.0 >= 1.0"`
+            DBH_LIBS=`$PKG_CONFIG --libs-only-l "dbh-1.0 >= 1.0"`
             echo "$as_me:$LINENO: result: $DBH_LIBS" >&5
 echo "${ECHO_T}$DBH_LIBS" >&6
         else

xffm-4.2.1-static.patch:

--- NEW FILE xffm-4.2.1-static.patch ---
diff -Nur xffm-4.2.1.orig/libs/callbacks.c xffm-4.2.1/libs/callbacks.c
--- xffm-4.2.1.orig/libs/callbacks.c	2004-12-29 14:51:17.000000000 -0700
+++ xffm-4.2.1/libs/callbacks.c	2005-03-20 13:52:51.937643998 -0700
@@ -665,7 +665,7 @@
     skip_second_release = FALSE;
 
     for (tree_id=0; tree_id<TREECOUNT; tree_id++) {      
-      static gboolean unsel(GtkTreeModel *,GtkTreePath *, GtkTreeIter *, gpointer);
+      gboolean unsel(GtkTreeModel *,GtkTreePath *, GtkTreeIter *, gpointer);
       /*printf("DBG: treeview is  0x%x==0x%x\n",tree_details->treestuff[tree_id].treeview,treeview);*/
       if (treeview != tree_details->treestuff[tree_id].treeview){
         /* unselect all in auxiliary treeview */


Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xffm.spec	20 Mar 2005 21:03:12 -0000	1.3
+++ xffm.spec	20 Mar 2005 21:13:51 -0000	1.4
@@ -6,8 +6,9 @@
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
 
-Patch: xffm-4.2.0-rpath.patch
+Patch0: xffm-4.2.0-rpath.patch
 Patch1: xffm-4.2.0-menu.patch
+Patch2: xffm-4.2.1-static.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,7 +20,7 @@
 Requires: libxml2 >= 2.4.0
 
 BuildRequires: dbh-devel
-BuildRequires: glib2-devel 
+BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfce4util-devel >= %{version}
@@ -32,8 +33,9 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rpath
+%patch0 -p1 -b .rpath
 %patch1 -p1 -b .menu
+%patch2 -p1 -b .static
 
 %build
 %configure
@@ -75,6 +77,7 @@
 - Fixed case of Xfce
 - Fixed Source0 line
 - Reimported 4.2.0 spec from core cvs
+- Added patch to remove static call that was breaking compile on devel. 
 
 * Mon Feb 21 2005 Than Ngo <than at redhat.com> 4.2.0-2
 - cleanup menu