[packages/applnk] - top level XDG dirs are owned by filesystem; release 7

[qboosh]

commit ad1137a8cdd99ce4ca9f426a7aa82d14064c0b04
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Sep 2 20:14:51 2020 +0200

    - top level XDG dirs are owned by filesystem; release 7

 applnk.spec | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)
---
diff --git a/applnk.spec b/applnk.spec
index 3ae1ed3..ccd9cf3 100644
--- a/applnk.spec
+++ b/applnk.spec
@@ -2,19 +2,20 @@ Summary:	Applnk - base directories tree used for storing desktop/kdelnk menu ent
 Summary(pl.UTF-8):	Applnk - bazowa struktura katalogów z opisami do plików desktop/kdelnk
 Name:		applnk
 Version:	2.2.0
-Release:	6
+Release:	7
 License:	GPL
 Group:		Base
 Source0:	ftp://ep09.pld-linux.org/software/applnk/%{name}-%{version}.tar.bz2
 # Source0-md5:	0af5401b44bb2c91c771da76c627b4f5
 Patch0:		xfce-4.10.patch
 Provides:	xdg-menus
+Requires:	filesystem >= 4.1-15
 Conflicts:	xfdesktop < 4.10.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_xdgconfdir	/etc/xdg
-%define		_xdgdatadir	%{_datadir}/desktop-directories
+%define		_xdgconfdir		/etc/xdg
+%define		_xdgdirectorydir	%{_datadir}/desktop-directories
 
 %description
 Base directories tree used for storing desktop/kdelnk menu entries.
@@ -37,7 +38,6 @@ grup/elementów katalogów.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_xdgconfdir}/menus/applications-merged
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -60,9 +60,24 @@ EOF
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS
-%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
-%dir %{_xdgconfdir}/menus
-%dir %{_xdgconfdir}/menus/applications-merged
-%{_xdgconfdir}/menus/*.menu
-%{_xdgdatadir}
-%{_pixmapsdir}/*
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/XDG_MENU_PREFIX
+%{_xdgconfdir}/menus/applnk-applications.menu
+%{_xdgdirectorydir}/accessories*.directory
+%{_xdgdirectorydir}/applications.directory
+%{_xdgdirectorydir}/development*.directory
+%{_xdgdirectorydir}/education.directory
+%{_xdgdirectorydir}/games*.directory
+%{_xdgdirectorydir}/gnome.directory
+%{_xdgdirectorydir}/gnome-settings.directory
+%{_xdgdirectorydir}/graphics*.directory
+%{_xdgdirectorydir}/kde.directory
+%{_xdgdirectorydir}/misc.directory
+%{_xdgdirectorydir}/multimedia*.directory
+%{_xdgdirectorydir}/network*.directory
+%{_xdgdirectorydir}/office*.directory
+%{_xdgdirectorydir}/science.directory
+%{_xdgdirectorydir}/settings*.directory
+%{_xdgdirectorydir}/system*.directory
+%{_xdgdirectorydir}/terminals.directory
+%{_xdgdirectorydir}/x11.directory
+%{_pixmapsdir}/package-*.png
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/applnk.git/commitdiff/ad1137a8cdd99ce4ca9f426a7aa82d14064c0b04