X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=applnk.spec;h=9e25dd9b41f466c015de7f9394bc4ea02acfca3b;hb=19cc8d00e0f3f69c4fb19343c4b38dac0e5c43f8;hp=aa57702866926fe3a90381ac8d168eb2272f9a50;hpb=efedda6b6d457d4de9e2fa360fb109aa908a76df;p=packages%2Fapplnk.git

diff --git a/applnk.spec b/applnk.spec
index aa57702..9e25dd9 100644
--- a/applnk.spec
+++ b/applnk.spec
@@ -1,23 +1,14 @@
 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
+Summary(pl.UTF-8):	Applnk - bazowa struktura katalogów z opisami do plików desktop/kdelnk
 Name:		applnk
-Version:	1.9.5
-Release:	17
+Version:	2.2.0
+Release:	3
 License:	GPL
 Group:		Base
-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
-BuildRequires:	autoconf
-BuildRequires:	automake
-Obsoletes:	gnome-menus
-Obsoletes:	gnome-menus-filter
+Source0:	ftp://ep09.pld-linux.org/software/applnk/%{name}-%{version}.tar.bz2
+# Source0-md5:	0af5401b44bb2c91c771da76c627b4f5
 Provides:	xdg-menus
+Conflicts:	xfdesktop < 4.8.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,46 +20,45 @@ Base directories tree used for storing desktop/kdelnk menu entries.
 Package also contains full description of this hierarchy (descriptions
 with translations and menu order).
 
-%description -l pl
-Bazowa struktura katalogów u¿ywana do przechowywania plików
-desktop/kdelnk opisu elementów menu ze spisem aplikacji. Pakiet
-zawiera pe³ny opis hierarchii katalogów (w plikach .directory) wraz z
-t³umaczeniami tych opisów, a tak¿e opis sposobu uszeregowania
-grup/elementów katalogów.
+%description -l pl.UTF-8
+Bazowa struktura katalogów używana do przechowywania plików
+desktop/kdelnk opisu elementów menu ze spisem aplikacji. Pakiet
+zawiera pełny opis hierarchii katalogów (w plikach .directory) wraz z
+tłumaczeniami tych opisów, a także opis sposobu uszeregowania
+grup/elementów katalogów.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-rm -f missing
-%{__aclocal}
-%{__autoconf}
-%{__automake}
 %configure
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_xdgconfdir}/menus/applications-merged \
-	$RPM_BUILD_ROOT%{_desktopdir}/docklets
+install -d $RPM_BUILD_ROOT%{_xdgconfdir}/menus/applications-merged
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	pixmapsdir=%{_pixmapsdir}
-
-install %{SOURCE1} $RPM_BUILD_ROOT%{_xdgconfdir}/menus/preferences.menu
-install %{SOURCE2} $RPM_BUILD_ROOT%{_xdgconfdir}/menus/settings.menu
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%banner %{name} -e << EOF
+Use of applnk menu is now controlled via XDG_MENU_PREFIX
+environment variable.  If you want to disable it, then edit
+/etc/env.d/XDG_MENU_PREFIX file.
+
+If your menus just disappeared you need to re-login!
+
+KDE users may have to logout, remove /{var,}/tmp/kdecache-*
+directories before loging in and run kbuildsycoca4.
+EOF
+
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS 
-%dir %{_desktopdir}/docklets
+%doc ChangeLog NEWS
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
 %dir %{_xdgconfdir}/menus
 %dir %{_xdgconfdir}/menus/applications-merged
 %{_xdgconfdir}/menus/*.menu