[tools] Changes to doc-publican-rpm produced specfile
John J. McDonough
jjmcd at fedoraproject.org
Fri Oct 15 14:57:16 UTC 2010
commit 2cf621cec0b67bb234a568798230f3c8a70e414a
Author: John J. McDonough <jjmcd at fedoraproject.org>
Date: Fri Oct 15 10:56:43 2010 -0400
Changes to doc-publican-rpm produced specfile
- Require coreutils
- Add blank line before %description
- Assume icons already in place from fedora-logos
tools/doc-publican-rpm/makeSpecFile.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/tools/doc-publican-rpm/makeSpecFile.c b/tools/doc-publican-rpm/makeSpecFile.c
index 91bbdb5..231bafd 100644
--- a/tools/doc-publican-rpm/makeSpecFile.c
+++ b/tools/doc-publican-rpm/makeSpecFile.c
@@ -306,8 +306,9 @@ void makeSpecFile( void )
//fprintf(f,"Requires:\t/usr/bin/htmlview\n");
// BZ583284 - unnecessary so rpmlint bitches
//fprintf(f,"Provides:\t%s = %%{version}-%%{release}\n\n",szBasename);
+ fprintf(f,"Requires:\tcoreutils\n");
- fprintf(f,"%%description\n");
+ fprintf(f,"\n%%description\n");
if ( !getOldDesc( szSpecName, f ) )
{
cleanString(rcConvInfo[0].szSubtitle,szCleanDesc);
@@ -371,9 +372,9 @@ void makeSpecFile( void )
fprintf(f,"\n");
fprintf(f,"#\n# Icons\n#\n");
fprintf(f,"ICONDIR=\"$RPM_BUILD_ROOT%%{_datadir}/icons/hicolor/\"\n");
- fprintf(f,"mkdir -p ${ICONDIR}/scalable/apps\n");
- fprintf(f,"install -m 644 document/en-US/images/icon.svg \\\n");
- fprintf(f," ${ICONDIR}/scalable/apps/fedora-documentation.svg\n");
+ //fprintf(f,"mkdir -p ${ICONDIR}/scalable/apps\n");
+ //fprintf(f,"install -m 644 document/en-US/images/icon.svg \\\n");
+ //fprintf(f," ${ICONDIR}/scalable/apps/fedora-documentation.svg\n");
fprintf(f,"for SZ in icons/* ; do\n");
fprintf(f," SZA=${SZ#icons/}\n");
fprintf(f," mkdir -p $RPM_BUILD_ROOT%%{_datadir}/icons/hicolor/${SZA}/apps \n");
@@ -411,7 +412,7 @@ void makeSpecFile( void )
fprintf(f,"%%{_datadir}/icons/hicolor/24x24/apps/fedora-documentation.png\n");
fprintf(f,"%%{_datadir}/icons/hicolor/32x32/apps/fedora-documentation.png\n");
fprintf(f,"%%{_datadir}/icons/hicolor/48x48/apps/fedora-documentation.png\n");
- fprintf(f,"%%{_datadir}/icons/hicolor/scalable/apps/fedora-documentation.svg\n");
+ // fprintf(f,"%%{_datadir}/icons/hicolor/scalable/apps/fedora-documentation.svg\n");
fprintf(f,"\n");
fprintf(f,"%%changelog\n");
More information about the docs-commits
mailing list