rpms/xfconf/EL-5 xfconf-4.6.2-no-g_strcmp0.patch, NONE, 1.1 xfconf.spec, 1.17, 1.18

[Kevin Fenzi]

Author: kevin

Update of /cvs/pkgs/rpms/xfconf/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11548

Modified Files:
	xfconf.spec 
Added Files:
	xfconf-4.6.2-no-g_strcmp0.patch 
Log Message:
Ooops. Add patch


xfconf-4.6.2-no-g_strcmp0.patch:
 xfconf-backend-perchannel-xml.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfconf-4.6.2-no-g_strcmp0.patch ---
diff --git a/xfconfd/xfconf-backend-perchannel-xml.c b/xfconfd/xfconf-backend-perchannel-xml.c
index 98fa0c3..ec0139f 100644
--- a/xfconfd/xfconf-backend-perchannel-xml.c
+++ b/xfconfd/xfconf-backend-perchannel-xml.c
@@ -1673,7 +1673,7 @@ xfconf_backend_perchannel_xml_load_channel(XfconfBackendPerchannelXml *xbpx,
      * follow the xdg spec, see bug #6079 for more information */
     length = g_strv_length(filenames);
     for(i = length - 1; i >= 0; --i) {
-        if(!g_strcmp0(user_file, filenames[i]))
+        if(user_file && !strcmp(user_file, filenames[i]))
             continue;
         xfconf_backend_perchannel_xml_merge_file(xbpx, filenames[i], TRUE,
                                                  channel, NULL);


Index: xfconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfconf/EL-5/xfconf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xfconf.spec	2 Jun 2010 09:29:41 -0000	1.17
+++ xfconf.spec	25 Jul 2010 22:16:33 -0000	1.18
@@ -1,12 +1,13 @@
 Name:           xfconf
 Version:        4.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://www.xfce.org/
 Source0:	http://archive.xfce.org/src/xfce/xfconf/4.6/xfconf-%{version}.tar.bz2
+Patch0:         xfconf-4.6.2-no-g_strcmp0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -56,6 +57,8 @@ interact with xfconf using perl. 
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
 %configure --disable-static --with-perl-options=INSTALLDIRS="vendor"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -115,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Jul 19 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-3
+- Add patch to not use g_strcmp0 on epel5
+
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano at redhat.com> - 4.6.2-2
 - Mass rebuild with perl-5.12.0