rpms/xastir/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xastir.desktop, 1.1, 1.2 xastir.spec, 1.14, 1.15

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4956

Modified Files:
	.cvsignore sources xastir.desktop xastir.spec 
Log Message:
* Sun Dec 21 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.5-1
- cleanup desktop file
- drop engunits patch (fixed upstream)
- upgrade to devel version (FTBS with previous version)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2008 18:47:24 -0000	1.3
+++ .cvsignore	21 Dec 2008 16:11:51 -0000	1.4
@@ -1 +1 @@
-xastir-1.9.4.tar.gz
+xastir-1.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2008 18:47:24 -0000	1.3
+++ sources	21 Dec 2008 16:11:51 -0000	1.4
@@ -1 +1 @@
-415a19df810d0b28ac61aa444c3e7e0a  xastir-1.9.4.tar.gz
+5108519683614e15c81bf78db4f75a38  xastir-1.9.5.tar.gz


Index: xastir.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xastir.desktop	8 Mar 2008 16:54:01 -0000	1.1
+++ xastir.desktop	21 Dec 2008 16:11:51 -0000	1.2
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=xastir
 GenericName=Xastir
 Comment=Amateur Station Tracking and Reporting system for amateur radio
 Exec=xastir
-Icon=xastir.png
+Icon=xastir
 Terminal=false
 Type=Application
 Categories=HamRadio;


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xastir.spec	1 Dec 2008 15:00:55 -0000	1.14
+++ xastir.spec	21 Dec 2008 16:11:51 -0000	1.15
@@ -1,14 +1,13 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
-Version: 1.9.4
-Release: 6%{?dist}
+Version: 1.9.5
+Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}.png
-Patch0:  xastir-1.9.4-libdir.patch
-Patch1:  xastir-1.9.4-engunits.patch
+Patch0:  xastir-1.9.5-libdir.patch
 URL:     http://www.xastir.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: wget
@@ -27,7 +26,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .engunits
 
 %build
 #./bootstrap.sh
@@ -57,6 +55,8 @@
 #the following two are not required and also could consider a potential risk #460429
 rm %{buildroot}/usr/share/xastir/get-maptools.sh
 rm %{buildroot}/usr/share/xastir/get_shapelib.sh
+#strip exec bit from .pm files
+find %{buildroot} -type f -name '*.pm' -exec chmod -x {} 2>/dev/null ';'
 mkdir -p %{buildroot}/usr/share/pixmaps/
 cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install \
@@ -71,17 +71,22 @@
 %defattr(-,root,root,-)
 %{_bindir}/xastir
 %{_bindir}/xastir_udp_client
+%{_bindir}/testdbfawk
 %{_bindir}/callpass
 %{_mandir}/man1/xastir.*
-%attr(0644,root,root) %{_datadir}/xastir/Coordinate.pm
 %{_datadir}/xastir
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE
 %doc README README.Contributing README.CVS README.Getting-Started
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Sun Dec 21 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.5-1
+- cleanup desktop file
+- drop engunits patch (fixed upstream)
+- upgrade to devel version (FTBS with previous version)
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.9.4-6
 - Rebuild for Python 2.6