SPECS: rox-Memo.spec - _appsdir -> _roxdir - fix path in desktop f...

[megabajt]

Author: megabajt                     Date: Fri Sep 30 17:20:57 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- _appsdir -> _roxdir
- fix path in desktop file on amd64
- release 2

---- Files affected:
SPECS:
   rox-Memo.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/rox-Memo.spec
diff -u SPECS/rox-Memo.spec:1.15 SPECS/rox-Memo.spec:1.16
--- SPECS/rox-Memo.spec:1.15	Sat Apr 30 07:53:11 2005
+++ SPECS/rox-Memo.spec	Fri Sep 30 19:20:52 2005
@@ -4,7 +4,7 @@
 Summary(pl):	ROX-Memo jest prostym budzikiem
 Name:		rox-%{_name}
 Version:	1.9.5
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/rox/%{_name}-%{version}.tgz
@@ -12,12 +12,12 @@
 Source1:	%{name}.desktop
 URL:		http://rox.sourceforge.net/phpwiki/index.php/Memo
 Requires:	python-pygtk-gtk
-Requires:	rox >= 2.2.0-2
+Requires:	rox >= 2.3
 Requires:	rox-Lib2
 %pyrequires_eq	python
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_appsdir	%{_libdir}/ROX-apps
+%define		_roxdir	%{_libdir}/rox
 
 %description
 ROX-Memo is a small utility which you can use to store appointments and 'TODO'
@@ -34,19 +34,20 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appsdir}/%{_name}/{Help,Messages},%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_roxdir}/%{_name}/{Help,Messages},%{_desktopdir},%{_pixmapsdir}}
 
 cd %{_name}
 
-install App* *.py .DirIcon Options.xml $RPM_BUILD_ROOT%{_appsdir}/%{_name}
-install Help/README $RPM_BUILD_ROOT%{_appsdir}/%{_name}/Help
-install Messages/it.gmo $RPM_BUILD_ROOT%{_appsdir}/%{_name}/Messages
+install App* *.py .DirIcon Options.xml $RPM_BUILD_ROOT%{_roxdir}/%{_name}
+install Help/README $RPM_BUILD_ROOT%{_roxdir}/%{_name}/Help
+install Messages/it.gmo $RPM_BUILD_ROOT%{_roxdir}/%{_name}/Messages
 
 install .DirIcon $RPM_BUILD_ROOT%{_pixmapsdir}/rox-Memo.png
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
-%py_comp $RPM_BUILD_ROOT%{_appsdir}/%{_name}
-%py_ocomp $RPM_BUILD_ROOT%{_appsdir}/%{_name}
+sed -e "s,/lib/,/%{_lib}/," %{SOURCE1} > $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+
+%py_comp $RPM_BUILD_ROOT%{_roxdir}/%{_name}
+%py_ocomp $RPM_BUILD_ROOT%{_roxdir}/%{_name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,14 +55,14 @@
 %files
 %defattr(644,root,root,755)
 %doc %{_name}/Help/Changes
-%attr(755,root,root) %{_appsdir}/%{_name}/AppRun
-%{_appsdir}/%{_name}/*.xml
-%{_appsdir}/%{_name}/.DirIcon
-%{_appsdir}/%{_name}/*.py[co]
-%{_appsdir}/%{_name}/Help
-%dir %{_appsdir}/%{_name}
-%dir %{_appsdir}/%{_name}/Messages
-%lang(it) %{_appsdir}/%{_name}/Messages/it.gmo
+%attr(755,root,root) %{_roxdir}/%{_name}/AppRun
+%{_roxdir}/%{_name}/*.xml
+%{_roxdir}/%{_name}/.DirIcon
+%{_roxdir}/%{_name}/*.py[co]
+%{_roxdir}/%{_name}/Help
+%dir %{_roxdir}/%{_name}
+%dir %{_roxdir}/%{_name}/Messages
+%lang(it) %{_roxdir}/%{_name}/Messages/it.gmo
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/*
 
@@ -71,6 +72,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2005/09/30 17:20:52  megabajt
+- _appsdir -> _roxdir
+- fix path in desktop file on amd64
+- release 2
+
 Revision 1.15  2005/04/30 05:53:11  megabajt
 - update URL
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rox-Memo.spec?r1=1.15&r2=1.16&f=u