SPECS: rox-Mem.spec - _appsdir -> _roxdir - fix path in desktop fi...

[megabajt]

Author: megabajt                     Date: Tue Sep 27 15:31:44 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- _appsdir -> _roxdir
- fix path in desktop file on amd64
- release 2

---- Files affected:
SPECS:
   rox-Mem.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/rox-Mem.spec
diff -u SPECS/rox-Mem.spec:1.9 SPECS/rox-Mem.spec:1.10
--- SPECS/rox-Mem.spec:1.9	Sun May  8 10:23:57 2005
+++ SPECS/rox-Mem.spec	Tue Sep 27 17:31:38 2005
@@ -5,7 +5,7 @@
 Summary(pl):	ROX-Mem wyświetla bieżące zużycie pamięci
 Name:		rox-%{_name}
 Version:	2.1.3
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://www.kerofin.demon.co.uk/rox/%{_name}-%{version}.tar.gz
@@ -23,11 +23,11 @@
 BuildRequires:	libgtop-devel >= 2.6.0
 BuildRequires:	libxml2-devel >= 2.4.0
 BuildRequires:	pkgconfig >= 0.9.0
-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-Mem can function as a ROX applet or a standalone program and
@@ -54,31 +54,31 @@
 
 %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 choice_install gtkrc rox_run $RPM_BUILD_ROOT%{_appsdir}/%{_name}
-install AppRun AppletRun $RPM_BUILD_ROOT%{_appsdir}/%{_name}
-install Help/README $RPM_BUILD_ROOT%{_appsdir}/%{_name}/Help
-install %{_platform}/Mem $RPM_BUILD_ROOT%{_appsdir}/%{_name}/%{_platform}
+install .DirIcon *.xml choice_install gtkrc $RPM_BUILD_ROOT%{_roxdir}/%{_name}
+install AppRun AppletRun $RPM_BUILD_ROOT%{_roxdir}/%{_name}
+install Help/README $RPM_BUILD_ROOT%{_roxdir}/%{_name}/Help
+install %{_platform}/Mem $RPM_BUILD_ROOT%{_roxdir}/%{_name}/%{_platform}
 install .DirIcon $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+sed -e "s,/lib/,/%{_lib}/," %{SOURCE1} > $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Help/{Changes,README,Versions}
-%attr(755,root,root) %{_appsdir}/%{_name}/*[Rr]un
-%attr(755,root,root) %{_appsdir}/%{_name}/choice_install
-%attr(755,root,root) %{_appsdir}/%{_name}/%{_platform}
-%dir %{_appsdir}/%{_name}
-%{_appsdir}/%{_name}/.DirIcon
-%{_appsdir}/%{_name}/*.xml
-%{_appsdir}/%{_name}/gtkrc
-%{_appsdir}/%{_name}/Help
+%doc Help/{Changes,Versions}
+%attr(755,root,root) %{_roxdir}/%{_name}/*Run
+%attr(755,root,root) %{_roxdir}/%{_name}/choice_install
+%attr(755,root,root) %{_roxdir}/%{_name}/%{_platform}
+%dir %{_roxdir}/%{_name}
+%{_roxdir}/%{_name}/.DirIcon
+%{_roxdir}/%{_name}/*.xml
+%{_roxdir}/%{_name}/gtkrc
+%{_roxdir}/%{_name}/Help
 %{_pixmapsdir}/%{name}.png
 %{_desktopdir}/%{name}.desktop
 
@@ -88,6 +88,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/09/27 15:31:38  megabajt
+- _appsdir -> _roxdir
+- fix path in desktop file on amd64
+- release 2
+
 Revision 1.9  2005/05/08 08:23:57  megabajt
 - up to 2.1.3
 
================================================================

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