From 78b43db51c135d261527338027027068acbe92f0 Mon Sep 17 00:00:00 2001
From: John J. McDonough <jjmcd@Aidan.(none)>
Date: Apr 17 2010 18:32:31 +0000
Subject: Multiple small fixes


- BZ 583285 Change main category to comply with standard
- BZ 583284 Remove version in desktop
- BZ 583284 Remove superfluous Provides in spec
- Remove Encoding in desktop
- Remove [Comment] in KDE desktop

---

diff --git a/tools/doc-publican-rpm/makeDesktopFile.c b/tools/doc-publican-rpm/makeDesktopFile.c
index 97d3047..534742f 100644
--- a/tools/doc-publican-rpm/makeDesktopFile.c
+++ b/tools/doc-publican-rpm/makeDesktopFile.c
@@ -70,7 +70,8 @@ void makeDesktopFile( char *szDir )
       exit(1);
     }
   fprintf(f,"[Desktop Entry]\n");
-  fprintf(f,"Encoding=UTF-8\n");
+  // desktop-file-validate doesn't like this
+  // fprintf(f,"Encoding=UTF-8\n");
   cleanString(rcConvInfo[0].szTitle,szTextString);
   fprintf(f,"Name=%s\n",szTextString);
   for ( i=1; i<nEntry; i++ )
@@ -97,8 +98,10 @@ void makeDesktopFile( char *szDir )
 	  szBasename);
   fprintf(f,"Terminal=false\n");
   fprintf(f,"Type=Application\n");
-  fprintf(f,"Categories=Documentation;X-Red-Hat-Base;\n");
-  fprintf(f,"Version=%s\n",szVersion);
+  // BZ583284 - Added System; at front
+  fprintf(f,"Categories=System;Documentation;X-Red-Hat-Base;\n");
+  // BZ583284 - unnecessary so rpmlint bitches
+  //fprintf(f,"Version=%s\n",szVersion);
   fprintf(f,"StartupNotify=true\n");
   fprintf(f,"X-Desktop-File-Install-Version=0.15\n");
   fclose(f);
@@ -116,7 +119,7 @@ void makeDesktopFile( char *szDir )
       exit(1);
     }
   fprintf(f,"[Desktop Entry]\n");
-  fprintf(f,"Encoding=UTF-8\n");
+  //fprintf(f,"Encoding=UTF-8\n");
   cleanString(rcConvInfo[0].szTitle,szTextString);
   fprintf(f,"Name=%s\n",szTextString);
   for ( i=1; i<nEntry; i++ )
@@ -135,15 +138,18 @@ void makeDesktopFile( char *szDir )
       fprintf(f,"GenericName[%s]=%s\n",
 	      szCLang,szTextString);
     }
-  cleanString(rcConvInfo[0].szSubtitle,szTextString);
-  fprintf(f,"Comment=%s\n",szTextString);
-  for ( i=1; i<nEntry; i++ )
-    {
-      cleanString(rcConvInfo[i].szSubtitle,szTextString);
-      cvtLang(rcConvInfo[i].szLang ,szCLang);
-      fprintf(f,"Comment[%s]=%s\n",
-	      szCLang,szTextString);
-    }
+  // desktop-file-validate doesn't like having this
+  // duplicate stuff here, not sure how much we will
+  // suffer if we drop this
+  /* cleanString(rcConvInfo[0].szSubtitle,szTextString); */
+  /* fprintf(f,"Comment=%s\n",szTextString); */
+  /* for ( i=1; i<nEntry; i++ ) */
+  /*   { */
+  /*     cleanString(rcConvInfo[i].szSubtitle,szTextString); */
+  /*     cvtLang(rcConvInfo[i].szLang ,szCLang); */
+  /*     fprintf(f,"Comment[%s]=%s\n", */
+  /* 	      szCLang,szTextString); */
+  /*   } */
   fprintf(f,"Exec=htmlview /usr/share/doc/HTML/%s/index.html\n",
 	  szBasename);
   fprintf(f,"Icon=/usr/share/doc/HTML/%s/en-US/images/icon.svg\n",
@@ -152,7 +158,8 @@ void makeDesktopFile( char *szDir )
   fprintf(f,"Type=Application\n");
   fprintf(f,"OnlyShowIn=KDE;\n");
   fprintf(f,"Categories=Qt;KDE;System;\n");
-  fprintf(f,"Version=%s\n",szVersion);
+  // BZ583284 - unnecessary so rpmlint bitches
+  //fprintf(f,"Version=%s\n",szVersion);
   fprintf(f,"X-KDE-StartupNotify=true\n");
   fprintf(f,"X-Desktop-File-Install-Version=0.15\n");
   fclose(f);
diff --git a/tools/doc-publican-rpm/makeSpecFile.c b/tools/doc-publican-rpm/makeSpecFile.c
index e1c96ee..7128adc 100644
--- a/tools/doc-publican-rpm/makeSpecFile.c
+++ b/tools/doc-publican-rpm/makeSpecFile.c
@@ -302,7 +302,8 @@ void makeSpecFile( void )
   fprintf(f,"BuildRoot:\t%%{_tmppath}/%%{name}-%%{version}-%%{release}-root-%%(%%{__id_u} -n)\n");
   fprintf(f,"BuildArch:\tnoarch\n");
   //fprintf(f,"Requires:\t/usr/bin/htmlview\n");
-  fprintf(f,"Provides:\t%s = %%{version}-%%{release}\n\n",szBasename);
+  // BZ583284 - unnecessary so rpmlint bitches
+  //fprintf(f,"Provides:\t%s = %%{version}-%%{release}\n\n",szBasename);
 
   fprintf(f,"%%description\n");
   if ( !getOldDesc( szSpecName, f ) )