From 64b0553bec32dfe233e43feba9693df265220e31 Mon Sep 17 00:00:00 2001
From: John J. McDonough <jjmcd@fedoraproject.org>
Date: May 10 2011 00:16:38 +0000
Subject: Make caillon changes to specfile


On 5/7 Christpher Aillon made a number of changes to the spec file
for fedora-release-notes to comply with changes to the packaging
guideline (commit e3a39ac0a929c493d4acf96cde929f793117f70a) this
commit includes those changes in the spec file created by
doc-publican-rpm.

---

diff --git a/tools/doc-publican-rpm/makeSpecFile.c b/tools/doc-publican-rpm/makeSpecFile.c
index 6a56bc7..6f940bd 100644
--- a/tools/doc-publican-rpm/makeSpecFile.c
+++ b/tools/doc-publican-rpm/makeSpecFile.c
@@ -393,21 +393,39 @@ void makeSpecFile( void )
   fprintf(f,"rm -rf $RPM_BUILD_ROOT\n");
   fprintf(f,"\n");
   fprintf(f,"%%post\n");
-  fprintf(f,"if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q; fi\n");
-  fprintf(f,"    touch --no-create /usr/share/icons/hicolor\n");
-  fprintf(f,"if [ -x /usr/bin/gtk-update-icon-cache ]; then\n");
-  fprintf(f,"    gtk-update-icon-cache -q /usr/share/icons/hicolor &> /dev/null || :\n");
-  fprintf(f,"fi\n");
-  fprintf(f,"if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev/null; fi\n");
+  //
+  // Changes Christopher Aillon made to fedora-release-notes.spec for
+  // new packaging guidelines 2011-05-07
+  // (e3a39ac0a929c493d4acf96cde929f793117f70a
+  //  fprintf(f,"if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q; fi\n");
+  //  fprintf(f,"    touch --no-create /usr/share/icons/hicolor\n");
+  //  fprintf(f,"if [ -x /usr/bin/gtk-update-icon-cache ]; then\n");
+  //  fprintf(f,"    gtk-update-icon-cache -q /usr/share/icons/hicolor &> /dev/null || :\n");
+  //  fprintf(f,"fi\n");
+  //  fprintf(f,"if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev/null; fi\n");
+  fprintf(f,"touch --no-create %%{_datadir}/icons/hicolor &>/dev/null || :\n");
+  fprintf(f,"update-desktop-database &> /dev/null || :\n");
+
   fprintf(f,"\n");
   fprintf(f,"%%postun\n");
-  fprintf(f,"if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q; fi\n");
-  fprintf(f,"    touch --no-create /usr/share/icons/hicolor\n");
-  fprintf(f,"if [ -x /usr/bin/gtk-update-icon-cache ]; then\n");
-  fprintf(f,"    gtk-update-icon-cache -q /usr/share/icons/hicolor &> /dev/null || :\n");
+  // more e3a39ac0a929c493d4acf96cde929f793117f70
+  //  fprintf(f,"if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q; fi\n");
+  //  fprintf(f,"    touch --no-create /usr/share/icons/hicolor\n");
+  //  fprintf(f,"if [ -x /usr/bin/gtk-update-icon-cache ]; then\n");
+  //  fprintf(f,"    gtk-update-icon-cache -q /usr/share/icons/hicolor &> /dev/null || :\n");
+  fprintf(f,"if [ $1 -eq 0 ] ; then\n");
+  fprintf(f,"    touch --no-create %%{_datadir}/icons/hicolor &>/dev/null\n");
+  fprintf(f,"    gtk-update-icon-cache %%{_datadir}/icons/hicolor &>/dev/null || :\n");
+
   fprintf(f,"fi\n");
-  fprintf(f,"if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q; fi\n");
-  fprintf(f,"if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev/null; fi\n");
+  // still more e3a39ac0a929c493d4acf96cde929f793117f70
+  //  fprintf(f,"if [ -x /usr/bin/scrollkeeper-update ]; then scrollkeeper-update -q; fi\n");
+  //  fprintf(f,"if [ -x /usr/bin/update-desktop-database ]; then update-desktop-database &> /dev/null; fi\n");
+  fprintf(f,"update-desktop-database &> /dev/null || :\n");
+  fprintf(f,"\n");
+  fprintf(f,"%%posttrans\n");
+  fprintf(f,"gtk-update-icon-cache %%{_datadir}/icons/hicolor &>/dev/null || :\n");
+
   fprintf(f,"\n");
   fprintf(f,"%%files\n");
   fprintf(f,"%%defattr(-,root,root,-)\n");