rpms/rarian/F-10 rarian-0.8.1-categories.patch, NONE, 1.1 rarian.spec, 1.17, 1.18

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/rarian/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8264

Modified Files:
	rarian.spec 
Added Files:
	rarian-0.8.1-categories.patch 
Log Message:

* Mon Nov 10 2008 Matthew Barnes <mbarnes at redhat.com> - 0.8.1-2
- Add patch for RH bug #453342 (OMF category parsing).


rarian-0.8.1-categories.patch:

--- NEW FILE rarian-0.8.1-categories.patch ---
diff -up rarian-0.8.1/librarian/rarian-omf.cpp.categories rarian-0.8.1/librarian/rarian-omf.cpp
--- rarian-0.8.1/librarian/rarian-omf.cpp.categories	2008-09-01 14:40:21.000000000 -0400
+++ rarian-0.8.1/librarian/rarian-omf.cpp	2008-11-10 19:42:02.000000000 -0500
@@ -637,28 +637,28 @@ omf_process_category (char *omf_cat)
 	result = strdup ("Filesystem");
       } else if (!strncmp (next, "Networking", 10)) {
 	result = strdup ("Network");
-      } else if (!strncmp (next, "Configuration", 13)) {
-	/* Yet another don't care */
-	result = strdup ("Settings");
-      } else if (!strncmp (next, "Hardware", 8)) {
-	/* Another don't care */
-	result = strdup ("HardwareSettings");
-      } else if (!strncmp (next, "Package Management", 18)) {
-	result = strdup ("PackageManager");
-      } else if (!strncmp (next, "Security", 8)) {
-	result = strdup ("Security");
-      } else if (!strncmp (next, "Services", 8)) {
-	next = &(next[8]);
-	while (*next == '|') next++;
-	if (!next || *next == 0) {
-	  result = strdup ("System");
-	} else if (!strncmp (next, "Printing", 8)) {
-	  result = strdup ("Printing");
-	} else {
-	  result = strdup ("System");
-	}
       } else {
-	goto failed;
+        goto failed;
+      }
+    } else if (!strncmp (next, "Configuration", 13)) {
+      /* Yet another don't care */
+      result = strdup ("Settings");
+    } else if (!strncmp (next, "Hardware", 8)) {
+      /* Another don't care */
+      result = strdup ("HardwareSettings");
+    } else if (!strncmp (next, "Package Management", 18)) {
+      result = strdup ("PackageManager");
+    } else if (!strncmp (next, "Security", 8)) {
+      result = strdup ("Security");
+    } else if (!strncmp (next, "Services", 8)) {
+      next = &(next[8]);
+      while (*next == '|') next++;
+      if (!next || *next == 0) {
+        result = strdup ("System");
+      } else if (!strncmp (next, "Printing", 8)) {
+        result = strdup ("Printing");
+      } else {
+        result = strdup ("System");
       }
     } else {
       goto failed;


Index: rarian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/F-10/rarian.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rarian.spec	2 Sep 2008 03:16:47 -0000	1.17
+++ rarian.spec	11 Nov 2008 00:55:25 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name: rarian
 Version: 0.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Summary: Rarian is a documentation meta-data library
@@ -11,6 +11,11 @@
 Source1: scrollkeeper-omf.dtd
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+### Patch ###
+
+# RH bug #453342
+Patch1: rarian-0.8.1-categories.patch
+
 ### Dependencies ###
 
 Requires(post): libxml2
@@ -57,6 +62,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .categories
 
 %build
 
@@ -122,6 +128,9 @@
 %{_libdir}/pkgconfig/rarian.pc
 
 %changelog
+* Mon Nov 10 2008 Matthew Barnes <mbarnes at redhat.com> - 0.8.1-2
+- Add patch for RH bug #453342 (OMF category parsing).
+
 * Mon Sep 01 2008 Matthew Barnes <mbarnes at redhat.com> - 0.8.1-1
 - Update to 0.8.1