- 1.9.0

[packages/applnk.git] / applnk.spec

diff --git a/applnk.spec b/applnk.spec
index dad2be559f8f911b2953618fb81f826eea573014..680b000250c59f91cd43464f46cd517b53c0f442 100644 (file)
--- a/applnk.spec
+++ b/applnk.spec
@@ -1,20 +1,19 @@
 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.6.4
+Version:       1.9.0
 Release:       1
 License:       GPL
 Group:         Base
 Source0:       http://www.kernel.pl/~adgor/pld/%{name}-%{version}.tar.bz2
-# Source0-md5: ae0a89432206334ce49fbaba7a95f04a
+# Source0-md5: 15d1f7c032416e5c2a3915c40c240120
 BuildRequires: autoconf
 BuildRequires: automake
-Conflicts:     wmconfig < 0.9.10-5
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _vfinfodir      %{_datadir}/desktop-directories
 %define                _xdgconfdir     /etc/xdg
+%define                _xdgdatadir     %{_datadir}/desktop-directories
 
 %description
 Base directories tree used for storing desktop/kdelnk menu entries.
@@ -43,17 +42,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       applnkdir=%{_applnkdir} \
        pixmapsdir=%{_pixmapsdir}
 
+install -d $RPM_BUILD_ROOT%{_xdgconfdir}/menus/applications-merged
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %dir %{_xdgconfdir}/menus
+%dir %{_xdgconfdir}/menus/applications-merged
 # should be marked as %%config
 %{_xdgconfdir}/menus/applications.menu
-%{_applnkdir}
-%{_vfinfodir}
+%{_xdgdatadir}
 %{_pixmapsdir}/*