SPECS: rox-Load.spec - fix path in desktop file on amd64 - _appsdi...

[megabajt]

Author: megabajt                     Date: Sun Sep 18 12:58:25 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix path in desktop file on amd64
- _appsdir -> _roxdir
- release 2

---- Files affected:
SPECS:
   rox-Load.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/rox-Load.spec
diff -u SPECS/rox-Load.spec:1.8 SPECS/rox-Load.spec:1.9
--- SPECS/rox-Load.spec:1.8	Fri Apr 29 15:26:39 2005
+++ SPECS/rox-Load.spec	Sun Sep 18 14:58:20 2005
@@ -5,13 +5,13 @@
 Summary(pl):	ROX-Load wyświetla średnie obciążenie Twojego systemu
 Name:		rox-%{_name}
 Version:	2.1.2
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://www.kerofin.demon.co.uk/rox/%{_name}-%{version}.tar.gz
 # Source0-md5:	da82394fd9874e1930b7fc2fa01c642b
 Source1:	%{name}.desktop
-#Patch0:		%{name}-paths-fix.patch
+#Patch0:	%{name}-paths-fix.patch
 Patch1:		%{name}-ROX-CLib2-include.patch
 Patch2:		%{name}-ROX-apps-paths.patch
 Patch3:		%{name}-aclocal.patch
@@ -20,11 +20,11 @@
 BuildRequires:	gtk+2-devel
 BuildRequires:	libgtop-devel >= 2.0.0
 BuildRequires:	libxml2-devel
-BuildRequires:	rox-CLib2-devel >= 2.1.4
-Requires:	rox >= 2.2.0-2
+BuildRequires:	rox-CLib2-devel >= 2.1.5-2
+Requires:	rox >= 2.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_appsdir	%{_libdir}/ROX-apps
+%define		_roxdir	%{_libdir}/rox
 
 %description
 ROX-Load is an applet for use in a ROX-Filer panel or pinboard. It
@@ -49,16 +49,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_appsdir}/%{_name}/{Help,%{_platform}}
+install -d $RPM_BUILD_ROOT%{_roxdir}/%{_name}/{Help,%{_platform}}
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-install .DirIcon *.xml AppRun rox_run $RPM_BUILD_ROOT%{_appsdir}/%{_name}
-install Help/README $RPM_BUILD_ROOT%{_appsdir}/%{_name}/Help
-install %{_platform}/Load $RPM_BUILD_ROOT%{_appsdir}/%{_name}/%{_platform}
+install .DirIcon *.xml AppRun rox_run $RPM_BUILD_ROOT%{_roxdir}/%{_name}
+install Help/README $RPM_BUILD_ROOT%{_roxdir}/%{_name}/Help
+install %{_platform}/Load $RPM_BUILD_ROOT%{_roxdir}/%{_name}/%{_platform}
 install .DirIcon $RPM_BUILD_ROOT%{_pixmapsdir}/rox-Load.png
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
-ln -sf AppRun $RPM_BUILD_ROOT%{_appsdir}/%{_name}/AppletRun
+sed -e "s,/lib/,/%{_lib}/," %{SOURCE1} > $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+ln -sf AppRun $RPM_BUILD_ROOT%{_roxdir}/%{_name}/AppletRun
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,13 +66,13 @@
 %files
 %defattr(644,root,root,755)
 %doc Help/{Changes,README,Versions}
-%attr(755,root,root) %{_appsdir}/%{_name}/App*Run
-%attr(755,root,root) %{_appsdir}/%{_name}/rox_run
-%attr(755,root,root) %{_appsdir}/%{_name}/%{_platform}
-%dir %{_appsdir}/%{_name}
-%{_appsdir}/%{_name}/.DirIcon
-%{_appsdir}/%{_name}/*.xml
-%{_appsdir}/%{_name}/Help
+%attr(755,root,root) %{_roxdir}/%{_name}/App*Run
+%attr(755,root,root) %{_roxdir}/%{_name}/rox_run
+%attr(755,root,root) %{_roxdir}/%{_name}/%{_platform}
+%dir %{_roxdir}/%{_name}
+%{_roxdir}/%{_name}/.DirIcon
+%{_roxdir}/%{_name}/*.xml
+%{_roxdir}/%{_name}/Help
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png
 
@@ -82,6 +82,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/09/18 12:58:20  megabajt
+- fix path in desktop file on amd64
+- _appsdir -> _roxdir
+- release 2
+
 Revision 1.8  2005/04/29 13:26:39  megabajt
 - moved dir %%{_appsdir} to rox.spec
 - R: rox >= 2.2.0-2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rox-Load.spec?r1=1.8&r2=1.9&f=u