Author: pfrields
Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26305/packaging
Modified Files: fedora-doc-common.spec fedora-doc.desktop.in.common Added Files: fedora-documentation.menu Log Message: Fix packaging to properly add menu and desktop files
--- NEW FILE fedora-documentation.menu --- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu> <Name>Applications</Name> <Menu> <Name>Documentation</Name> <Directory>Documentation.directory</Directory>
<Include> <Category>X-Fedora-Documentation</Category> </Include> </Menu> </Menu>
Index: fedora-doc-common.spec =================================================================== RCS file: /cvs/docs/docs-common/packaging/fedora-doc-common.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-doc-common.spec 12 Oct 2005 00:09:41 -0000 1.1 +++ fedora-doc-common.spec 12 Oct 2005 14:59:43 -0000 1.2 @@ -35,6 +35,10 @@ install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/css/ install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/css/* \ $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/css/ +install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications-merged/ +install -m 644 \ + $RPM_BUILD_DIR/%{name}-%{release}/packaging/fedora-documentation.menu \ + $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications-merged/ install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/ install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/stylesheet-images/* \ $RPM_BUILD_ROOT/%{_datadir}/fedora/doc/docs-common/stylesheet-images/ @@ -50,6 +54,6 @@ %{_datadir}/fedora/doc/docs-common/common/* %{_datadir}/fedora/doc/docs-common/css/* %{_datadir}/fedora/doc/docs-common/stylesheet-images/* - +%{_sysconfdir}/xdg/menus/applications-merged/*
%changelog
Index: fedora-doc.desktop.in.common =================================================================== RCS file: /cvs/docs/docs-common/packaging/fedora-doc.desktop.in.common,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-doc.desktop.in.common 3 Oct 2005 02:38:12 -0000 1.2 +++ fedora-doc.desktop.in.common 12 Oct 2005 14:59:43 -0000 1.3 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Categories=Application;Documentation;X-Red-Hat-Base; +Categories=X-Fedora-Documentation; Name=@TITLE@ GenericName=@TITLE@ Exec=gnome-help file:///usr/share/fedora/doc/fedora-doc-@DOCBASE@/C/@DOCBASE@-en.xml
docs-commits@lists.fedoraproject.org