aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--desktop-common-data.spec7
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 60743a9..e1ea028 100644
--- a/Makefile
+++ b/Makefile
@@ -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/