- causes only gnome capplets to appear in Settings/GNOME

[packages/applnk.git] / applnk.spec

diff --git a/applnk.spec b/applnk.spec
index 5fde23328f3bec0ebd942db21a2341bd0b8f50dc..ea8243768389c5af77723a919d4cc351b2ee77e7 100644 (file)
--- a/applnk.spec
+++ b/applnk.spec
@@ -1,22 +1,20 @@
 Summary:       Applnk - base directories tree used for storing desktop/kdelnk menu entries
 Summary(pl):   Applnk - bazowa struktura katalogów z opisami do plików desktop/kdelnk
 Name:          applnk
-Version:       1.5.17
+Version:       1.9.4
 Release:       1
 License:       GPL
 Group:         Base
-# This file does not exist at this URL.
-#Source0:      ftp://ftp.pld.org.pl/software/applnk/%{name}-%{version}.tar.bz2
+#Source0:      ftp://ftp.pld-linux.org/software/applnk/
 Source0:       %{name}-%{version}.tar.bz2
+# Source0-md5: 85300a3ea420042be20e8438c7e42dd0
 BuildRequires: autoconf
 BuildRequires: automake
-Conflicts:     wmconfig < 0.9.10-5
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
-%define                _vdconfdir      /etc/X11/desktop
-%define                _vdinfodir      %{_datadir}/desktop-directories
+%define                _xdgconfdir     /etc/xdg
+%define                _xdgdatadir     %{_datadir}/desktop-directories
 
 %description
 Base directories tree used for storing desktop/kdelnk menu entries.
@@ -42,22 +40,20 @@ rm -f missing
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_xdgconfdir}/menus/applications-merged
 
-%{__make} install applnkdir=%{_applnkdir} pixmapsdir=%{_pixmapsdir} \
-               DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_desktopdir}
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       pixmapsdir=%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%dir %{_vdconfdir}
-%dir %{_vdconfdir}/menus
+%dir %{_xdgconfdir}/menus
+%dir %{_xdgconfdir}/menus/applications-merged
 # should be marked as %%config
-%{_vdconfdir}/menus/applications.menu
-%{_applnkdir}
-%{_desktopdir}
-%{_vdinfodir}
+%{_xdgconfdir}/menus/applications.menu
+%{_xdgdatadir}
 %{_pixmapsdir}/*