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

diff --git a/applnk.spec b/applnk.spec
index 5c188c7..812268b 100644
--- a/applnk.spec
+++ b/applnk.spec
@@ -1,20 +1,29 @@
 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
-Release:	1
+Version:	1.9.5
+Release:	20
 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/%{name}-%{version}.tar.bz2
+# Source0-md5:	e3d5d40cfd4ea6c891d4e337004e09f4
+Source1:	%{name}-gnome-preferences.menu
+Source2:	%{name}-gnome-settings.menu
+Patch0:		%{name}-system.patch
+Patch1:		%{name}-gnome.patch
+Patch2:		%{name}-category.patch
+Patch3:		%{name}-ca+es.patch
+Patch4:		%{name}-finance.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
-Conflicts:	wmconfig < 0.9.10-5
+Obsoletes:	gnome-menus
+Obsoletes:	gnome-menus-filter
+Provides:	xdg-menus
 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.
@@ -30,6 +39,11 @@ grup/element
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 rm -f missing
@@ -40,21 +54,23 @@ rm -f missing
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_xdgconfdir}/menus/applications-merged
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	applnkdir=%{_applnkdir} \
 	pixmapsdir=%{_pixmapsdir}
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_xdgconfdir}/menus/preferences.menu
+install %{SOURCE2} $RPM_BUILD_ROOT%{_xdgconfdir}/menus/settings.menu
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%dir %{_xdgconfdir}
+%doc ChangeLog NEWS
 %dir %{_xdgconfdir}/menus
-# should be marked as %%config
-%{_xdgconfdir}/menus/applications.menu
-%{_applnkdir}
-%{_vfinfodir}
+%dir %{_xdgconfdir}/menus/applications-merged
+%{_xdgconfdir}/menus/*.menu
+%{_xdgdatadir}
 %{_pixmapsdir}/*