diff options
| author | Paul W. Frields <stickster@gmail.com> | 2005-10-12 14:59:43 +0000 |
|---|---|---|
| committer | Paul W. Frields <stickster@gmail.com> | 2005-10-12 14:59:43 +0000 |
| commit | 73090dd5b4a3ae476a99d05fedca198579b51059 (patch) | |
| tree | 6be6a467e5b14c98f881358035b724fd964aeeba | |
| parent | 00c1102821bbc03fcf2cc3a7cb09dae8bc4e5e0b (diff) | |
| download | fedora-doc-utils-73090dd5b4a3ae476a99d05fedca198579b51059.tar.gz fedora-doc-utils-73090dd5b4a3ae476a99d05fedca198579b51059.tar.xz fedora-doc-utils-73090dd5b4a3ae476a99d05fedca198579b51059.zip | |
Fix packaging to properly add menu and desktop files
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | packaging/fedora-doc-common.spec | 6 | ||||
| -rw-r--r-- | packaging/fedora-doc.desktop.in.common | 2 | ||||
| -rw-r--r-- | packaging/fedora-documentation.menu | 14 |
4 files changed, 21 insertions, 2 deletions
@@ -40,6 +40,7 @@ rpm: update find . -maxdepth 1 -type d \( \ -name 'common' -o \ -name 'css' -o \ + -name 'packaging' -o \ -name 'stylesheet-images' \) | xargs -i \ find {} -maxdepth 1 -type f ! \( \ -name '.*' -o -name '*~' -o \ diff --git a/packaging/fedora-doc-common.spec b/packaging/fedora-doc-common.spec index 263f4be..ac0d7f6 100644 --- a/packaging/fedora-doc-common.spec +++ b/packaging/fedora-doc-common.spec @@ -35,6 +35,10 @@ install -m 644 $RPM_BUILD_DIR/%{name}-%{release}/common/*.{xml,ent} \ 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 @@ rm -rf $RPM_BUILD_ROOT %{_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 diff --git a/packaging/fedora-doc.desktop.in.common b/packaging/fedora-doc.desktop.in.common index c70929c..3779ca0 100644 --- a/packaging/fedora-doc.desktop.in.common +++ b/packaging/fedora-doc.desktop.in.common @@ -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 diff --git a/packaging/fedora-documentation.menu b/packaging/fedora-documentation.menu new file mode 100644 index 0000000..aaf7a72 --- /dev/null +++ b/packaging/fedora-documentation.menu @@ -0,0 +1,14 @@ +<!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> |