rpms/libwfut/F-8 libwfut-0.2.0-system-tinyxml.patch, 1.1, 1.2 libwfut.spec, 1.5, 1.6

[Alexey Torkhov]

Author: atorkhov

Update of /cvs/pkgs/rpms/libwfut/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28097

Modified Files:
	libwfut-0.2.0-system-tinyxml.patch libwfut.spec 
Log Message:
* Thu Oct 23 2008 Alexey Torkhov <atorkhov at gmail.com> 0.2.0-4
- Fixing system-tinyxml patch.


libwfut-0.2.0-system-tinyxml.patch:

Index: libwfut-0.2.0-system-tinyxml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libwfut/F-8/libwfut-0.2.0-system-tinyxml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libwfut-0.2.0-system-tinyxml.patch	19 Jun 2008 07:40:09 -0000	1.1
+++ libwfut-0.2.0-system-tinyxml.patch	23 Oct 2008 11:35:32 -0000	1.2
@@ -729,7 +729,7 @@
    assert(element);
    TiXmlNode * node;
 -  const char *name_val = element->Attribute(TAG_name);
-+  const char *name_val = element->Attribute(TAG_name)->c_str();
++  const char *name_val = element->Attribute(TAG_name.c_str());
    if (name_val != NULL) {
      channel.name = name_val;
    }
@@ -741,25 +741,25 @@
    assert(element);
  
 -  const char *fname = element->Attribute(TAG_filename);
-+  const char *fname = element->Attribute(TAG_filename)->c_str();
++  const char *fname = element->Attribute(TAG_filename.c_str());
    if (fname != NULL) {
      file.filename = Encoder::decodeString(fname);
    }
 -  sscanf(element->Attribute(TAG_version), "%d", &file.version);
 -  sscanf(element->Attribute(TAG_crc32), "%lu", &file.crc32);
 -  sscanf(element->Attribute(TAG_size), "%ld", &file.size);
-+  sscanf(element->Attribute(TAG_version)->c_str(), "%d", &file.version);
-+  sscanf(element->Attribute(TAG_crc32)->c_str(), "%lu", &file.crc32);
-+  sscanf(element->Attribute(TAG_size)->c_str(), "%ld", &file.size);
++  sscanf(element->Attribute(TAG_version.c_str()), "%d", &file.version);
++  sscanf(element->Attribute(TAG_crc32.c_str()), "%lu", &file.crc32);
++  sscanf(element->Attribute(TAG_size.c_str()), "%ld", &file.size);
    // Check for execute flag
 -  const char *exec = element->Attribute(TAG_execute);
-+  const char *exec = element->Attribute(TAG_execute)->c_str();
++  const char *exec = element->Attribute(TAG_execute.c_str());
    if (exec && strlen(exec) >= 4 && strncmp(exec, "true", 4) == 0) file.execute = true;
    else file.execute = false;
  
    // Check for deleted flag
 -  const char *deleted = element->Attribute(TAG_deleted);
-+  const char *deleted = element->Attribute(TAG_deleted)->c_str();
++  const char *deleted = element->Attribute(TAG_deleted.c_str());
    if (deleted && strlen(deleted) >= 4 && strncmp(deleted, "true", 4) == 0) file.deleted = true;
    else file.deleted = false;
  
@@ -768,7 +768,7 @@
    assert(node);
  
 -  const char *dir = node->ToElement()->Attribute(TAG_dir);
-+  const char *dir = node->ToElement()->Attribute(TAG_dir)->c_str();
++  const char *dir = node->ToElement()->Attribute(TAG_dir.c_str());
    if (dir) {
      files.setName(dir);
    } 


Index: libwfut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwfut/F-8/libwfut.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libwfut.spec	18 Sep 2008 09:59:14 -0000	1.5
+++ libwfut.spec	23 Oct 2008 11:35:32 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           libwfut
 Version:        0.2.0
-Release:        3%{?dist}.2
+Release:        4%{?dist}
 Summary:        Software updater tool for WorldForge applications
 
 Group:          Development/Libraries
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Thu Oct 23 2008 Alexey Torkhov <atorkhov at gmail.com> 0.2.0-4
+- Fixing system-tinyxml patch.
+
 * Fri Sep 18 2008 Alexey Torkhov <atorkhov at gmail.com> 0.2.0-3.2
 - Fixing deps for F-8.