packages: gmapcatcher/gmapcatcher.spec - unify path names; rel 1

[glen]

Author: glen                         Date: Sun Dec 26 19:23:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify path names; rel 1

---- Files affected:
packages/gmapcatcher:
   gmapcatcher.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/gmapcatcher/gmapcatcher.spec
diff -u packages/gmapcatcher/gmapcatcher.spec:1.2 packages/gmapcatcher/gmapcatcher.spec:1.3
--- packages/gmapcatcher/gmapcatcher.spec:1.2	Sun Dec 26 20:08:31 2010
+++ packages/gmapcatcher/gmapcatcher.spec	Sun Dec 26 20:23:28 2010
@@ -2,7 +2,7 @@
 Summary:	Offline maps viewer for multiple providers
 Name:		gmapcatcher
 Version:	0.7.5.0
-Release:	0.3
+Release:	1
 License:	GPL
 Group:		Applications
 URL:		http://code.google.com/p/gmapcatcher/
@@ -36,40 +36,40 @@
 %{__python} setup.py install \
 	--prefix=%{_prefix} \
 	--root=$RPM_BUILD_ROOT \
-	--install-scripts=%{_prefix}/lib/gmapcatcher
+	--install-scripts=%{_bindir}
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
 %py_postclean
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/mapcatcher
 
-install -d $RPM_BUILD_ROOT%{_desktopdir}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_bindir}}
 cp -a %{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}
+sed -i -e 's,Exec=mapcatcher,Exec=%{name},' $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+sed -i -e 's,Icon=mapcatcher,Icon=%{name},' $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
-# Remove eronious folders from list of filenames
-install -d $RPM_BUILD_ROOT%{_bindir}
-ln -s %{_prefix}/lib/gmapcatcher/maps.py $RPM_BUILD_ROOT%{_bindir}/gmapcatcher
-ln -s %{_prefix}/lib/gmapcatcher/download.py $RPM_BUILD_ROOT%{_bindir}/gmapcatcher-cli
+mv $RPM_BUILD_ROOT%{_pixmapsdir}/{map,%{name}}.png
+mv $RPM_BUILD_ROOT%{_bindir}/{maps.py,%{name}}
+mv $RPM_BUILD_ROOT%{_bindir}/{download.py,%{name}downloader}
+mv $RPM_BUILD_ROOT%{_mandir}/man1/{mapcatcher.1,%{name}.1}.gz
+mv $RPM_BUILD_ROOT%{_mandir}/man1/{mapdownloader.1,%{name}downloader.1}.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gmapcatcher
-%attr(755,root,root) %{_bindir}/gmapcatcher-cli
-%{_mandir}/man1/mapcatcher.1*
-%{_mandir}/man1/mapdownloader.1*
-%{_desktopdir}/gmapcatcher.desktop
-%{_pixmapsdir}/map.png
-%{_pixmapsdir}/gmapcatcher
-%dir %{_prefix}/lib/gmapcatcher
-%attr(755,root,root) %{_prefix}/lib/gmapcatcher/download.py
-%attr(755,root,root) %{_prefix}/lib/gmapcatcher/maps.py
-%dir %{py_sitescriptdir}/gmapcatcher
-%{py_sitescriptdir}/gmapcatcher/*.py[co]
-%{py_sitescriptdir}/gmapcatcher/pyGPSD
-%{py_sitescriptdir}/gmapcatcher/mapServers
+%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/%{name}downloader
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/%{name}downloader.1*
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png
+%{_pixmapsdir}/%{name}
+%dir %{py_sitescriptdir}/%{name}
+%{py_sitescriptdir}/%{name}/*.py[co]
+%{py_sitescriptdir}/%{name}/pyGPSD
+%{py_sitescriptdir}/%{name}/mapServers
 %if "%{py_ver}" > "2.4"
 %{py_sitescriptdir}/GMapCatcher-*.egg-info
 %endif
@@ -80,6 +80,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/12/26 19:23:28  glen
+- unify path names; rel 1
+
 Revision 1.2  2010/12/26 19:08:31  glen
 - sqlite3 py module
 - java script != javascript
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmapcatcher/gmapcatcher.spec?r1=1.2&r2=1.3&f=u