diff options
| author | Frederic Crozat <fcrozat@mandriva.com> | 2006-05-04 16:23:37 +0000 |
|---|---|---|
| committer | Frederic Crozat <fcrozat@mandriva.com> | 2006-05-04 16:23:37 +0000 |
| commit | 42949be7b8485b806021ad61efaaa3ee12a073dc (patch) | |
| tree | 31af306bd7e2a09e8f6783e17dd4a79471a73c10 | |
| parent | 1b23b615b3b37a3b8526e282e6ffec76dbd5d1e5 (diff) | |
| download | common-data-42949be7b8485b806021ad61efaaa3ee12a073dc.tar common-data-42949be7b8485b806021ad61efaaa3ee12a073dc.tar.gz common-data-42949be7b8485b806021ad61efaaa3ee12a073dc.tar.bz2 common-data-42949be7b8485b806021ad61efaaa3ee12a073dc.tar.xz common-data-42949be7b8485b806021ad61efaaa3ee12a073dc.zip | |
Fix menu location
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | desktop-common-data.spec | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -22,7 +22,7 @@ dir: localcopy: find . -not -name "$(PACKAGE)-$(VERSION)"|cpio -pd $(PACKAGE)-$(VERSION)/ - find $(PACKAGE)-$(VERSION) -type d -name CVS -o -name .cvsignore |xargs rm -rf + find $(PACKAGE)-$(VERSION) -type d -name CVS -o -name .cvsignore -name '*~' |xargs rm -rf tar: tar cvf $(PACKAGE)-$(VERSION).tar $(PACKAGE)-$(VERSION) diff --git a/desktop-common-data.spec b/desktop-common-data.spec index c08d0ad..1fb2145 100644 --- a/desktop-common-data.spec +++ b/desktop-common-data.spec @@ -103,7 +103,7 @@ install -m 0644 menu/defaultlayout-simplified.menu %buildroot/%_localstatedir/me # XDG menus install -d -m 0755 %buildroot/%_sysconfdir/xdg/menus/applications-merged install -d -m 0755 %buildroot/%_sysconfdir/menu.d -install -m 0644 menu/applications-mdk.menu %buildroot/%_sysconfdir/xdg/ +install -m 0644 menu/applications-mdk.menu %buildroot/%_sysconfdir/xdg/menus install -m 0755 menu/xdg_menu %buildroot/%_bindir #temporary name install -m 0755 menu/update-menus %buildroot/%_bindir/update-menus-xdg @@ -148,7 +148,10 @@ rm -fr %buildroot %_sysconfdir/X11/xinit.d/* %dir %_sysconfdir/menu.d -%_sysconfdir/xdg +%dir %_sysconfdir/xdg +%dir %_sysconfdir/xdg/menus +%dir %_sysconfdir/xdg/menus/applications-merged +%config(noreplace) %_sysconfdir/xdg/menus/*.menu # %dir %_datadir/faces/ |