- rel 3, fixed capplet patch

[packages/applnk.git] / applnk.spec

diff --git a/applnk.spec b/applnk.spec
index a6582f9c8bd6c17bb34a93fa3be241178cf42387..052065a956370b6137e9bf5c8cf89bd667cc4f8c 100644 (file)
--- a/applnk.spec
+++ b/applnk.spec
@@ -1,17 +1,21 @@
 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.16
-Release:       1
+Version:       1.9.4
+Release:       3
 License:       GPL
 Group:         Base
-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
+Patch0:                %{name}-capplet.patch
 BuildRequires: autoconf
 BuildRequires: automake
-Conflicts:     wmconfig < 0.9.10-5
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _xdgconfdir     /etc/xdg
+%define                _xdgdatadir     %{_datadir}/desktop-directories
 
 %description
 Base directories tree used for storing desktop/kdelnk menu entries.
@@ -27,6 +31,7 @@ grup/element
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 rm -f missing
@@ -37,14 +42,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
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       pixmapsdir=%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_applnkdir}
+%dir %{_xdgconfdir}/menus
+%dir %{_xdgconfdir}/menus/applications-merged
+# should be marked as %%config
+%{_xdgconfdir}/menus/applications.menu
+%{_xdgdatadir}
 %{_pixmapsdir}/*