X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=applnk.spec;h=3f13d3acb659231145daac67be54298c12586a94;hb=68e21da59ce6f4066ccbcd3424247ff6ef1a6c91;hp=5c188c7479b2d0fdf5b6c1bc0ef910adae2d454c;hpb=e42fb129567b84217b9dfb817c69c26d6f917a16;p=packages%2Fapplnk.git

diff --git a/applnk.spec b/applnk.spec
index 5c188c7..3f13d3a 100644
--- a/applnk.spec
+++ b/applnk.spec
@@ -1,20 +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.6.4
+Version:	1.9.3
 Release:	1
 License:	GPL
 Group:		Base
-Source0:	http://www.kernel.pl/~adgor/pld/%{name}-%{version}.tar.bz2
-# Source0-md5:	ae0a89432206334ce49fbaba7a95f04a
+#Source0:	ftp://ftp.pld-linux.org/software/applnk/
+Source0:	%{name}-%{version}.tar.bz2
+# Source0-md5:	4ca390faf2287051251cca02d971bac1
 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,18 +43,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}
 %dir %{_xdgconfdir}/menus
+%dir %{_xdgconfdir}/menus/applications-merged
 # should be marked as %%config
 %{_xdgconfdir}/menus/applications.menu
-%{_applnkdir}
-%{_vfinfodir}
+%{_xdgdatadir}
 %{_pixmapsdir}/*