rpms/dxcc/F-8 dxcc-20071205-gui.patch, NONE, 1.1 dxcc-20071205-makefile.patch, NONE, 1.1 dxcc.desktop, NONE, 1.1 dxcc.png, NONE, 1.1 dxcc.spec, NONE, 1.1 sources, 1.1, 1.2

[Robert 'Bob' Jensen (bjensen)]

Author: bjensen

Update of /cvs/pkgs/rpms/dxcc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3259

Modified Files:
	sources 
Added Files:
	dxcc-20071205-gui.patch dxcc-20071205-makefile.patch 
	dxcc.desktop dxcc.png dxcc.spec 
Log Message:
* Tue Feb 26 2008 Robert 'Bob' Jensen - 20080225-3
- Submit for review


dxcc-20071205-gui.patch:

--- NEW FILE dxcc-20071205-gui.patch ---
diff -Naur dxcc-20071205-orig/dxcc dxcc-20071205/dxcc
--- dxcc-20071205-orig/dxcc	2007-12-10 11:29:46.000000000 +0100
+++ dxcc-20071205/dxcc	2007-12-10 11:24:56.000000000 +0100
@@ -85,7 +85,7 @@
 	}
 	
 	unless ($hastk) {
-		die "Tk.pm not found. Exiting.";
+		die "No GUI available, install dxcc-gui.";
 	}
 
 	# This is like 'use Tk', except that use is always done at compile
diff -Naur dxcc-20071205-orig/dxcc-gui dxcc-20071205/dxcc-gui
--- dxcc-20071205-orig/dxcc-gui	1970-01-01 01:00:00.000000000 +0100
+++ dxcc-20071205/dxcc-gui	2007-12-10 11:43:15.000000000 +0100
@@ -0,0 +1,3 @@
+#!/bin/bash
+#execute gui
+dxcc -g
diff -Naur dxcc-20071205-orig/dxcc-gui~ dxcc-20071205/dxcc-gui~
--- dxcc-20071205-orig/dxcc-gui~	1970-01-01 01:00:00.000000000 +0100
+++ dxcc-20071205/dxcc-gui~	2007-12-10 11:43:13.000000000 +0100
@@ -0,0 +1,3 @@
+#!/bin/bash
+#execute gui
+dxcc -g
diff -Naur dxcc-20071205-orig/Makefile dxcc-20071205/Makefile
--- dxcc-20071205-orig/Makefile	2007-12-10 11:29:46.000000000 +0100
+++ dxcc-20071205/Makefile	2007-12-10 11:30:35.000000000 +0100
@@ -12,6 +12,7 @@
 	install -D -m 0644 dxcc.1	$(DESTDIR)/usr/share/man/man1/
 	install -D -m 0644 earth.gif	$(DESTDIR)/usr/share/dxcc/
 	install -D -m 0755 dxcc		$(DESTDIR)/usr/bin/dxcc
+	install -D -m 0755 dxcc-gui	$(DESTDIR)/usr/bin/dxcc-gui
 	
 uninstall:
 	rm -f $(DESTDIR)/bin/dxcc

dxcc-20071205-makefile.patch:

--- NEW FILE dxcc-20071205-makefile.patch ---
diff -up dxcc-20071205/Makefile.orig dxcc-20071205/Makefile
--- dxcc-20071205/Makefile.orig	2007-12-10 11:08:07.000000000 +0100
+++ dxcc-20071205/Makefile	2007-12-10 11:11:12.000000000 +0100
@@ -1,17 +1,17 @@
 # dxcc Makefile -- Fabian Kurz, DJ1YFK -- http://fkurz.net/ham/dxcc.html
 
 VERSION = `date +%Y%m%d`
-DESTDIR ?= /usr
+DESTDIR=
 
 all:
 	@echo -e "dxcc - make [install|uninstall|clean|dist] \nCheck README for help."
 
 install:
-	install -d -v				$(DESTDIR)/share/man/man1/
-	install -d -v				$(DESTDIR)/share/dxcc/
-	install -m 0644 dxcc.1		$(DESTDIR)/share/man/man1/
-	install -m 0644 earth.gif	$(DESTDIR)/share/dxcc/
-	install -m 0755 dxcc		$(DESTDIR)/bin/
+	install -D -d -v		$(DESTDIR)/usr/share/man/man1/
+	install -D -d -v		$(DESTDIR)/usr/share/dxcc/
+	install -D -m 0644 dxcc.1	$(DESTDIR)/usr/share/man/man1/
+	install -D -m 0644 earth.gif	$(DESTDIR)/usr/share/dxcc/
+	install -D -m 0755 dxcc		$(DESTDIR)/usr/bin/dxcc
 	
 uninstall:
 	rm -f $(DESTDIR)/bin/dxcc


--- NEW FILE dxcc.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=dxcc
GenericName=dxcc
Comment=Small utility which determines the ARRL DXCC entity of a ham radio callsign
Exec=dxcc-gui
Icon=dxcc.png
Terminal=false
Type=Application
Categories=HamRadio;
Version=1.0


--- NEW FILE dxcc.spec ---
Name:           dxcc
Version:        20080225
Release:        3%{?dist}
Summary:        Small utility which determines the ARRL DXCC entity of a ham radio callsign

Group:          Applications/Communications
License:        GPLv2+
URL:            http://fkurz.net/ham/dxcc.html
Source0:        http://fkurz.net/ham/dxcc/%{name}-%{version}.tar.gz
#add .desktop file
Source1:        %{name}.desktop
#temporary Icon
Source2:        %{name}.png
#fix install path
Patch0:         dxcc-20071205-makefile.patch
#separate core and gui
Patch1:         dxcc-20071205-gui.patch


BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
dxcc is a small utility which determines the ARRL DXCC entity of a ham radio
callsign, based on the cty.dat country file by Jim Reisert, AD1C. 

Optional GUI with a world map showing the DXCC's location available.

%package gui
Summary:       Optional GUI with a world map showing the DXCC's location
Group:         Applications/Communications
BuildRequires: desktop-file-utils
Requires:      %{name} = %{version}-%{release}
Requires:      perl(Tk)

%description gui
dxcc-gui is a small utility which determines the ARRL DXCC entity of a amateur 
radio callsign, based on the cty.dat country file by Jim Reisert, AD1C. 

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# no upstream .desktop or icon yet
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
desktop-file-install --vendor="fedora" \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_bindir}/dxcc
%{_mandir}/man?/*
%{_datadir}/dxcc

%files gui
%doc COPYING
%{_bindir}/dxcc-gui
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/*%{name}.desktop


%changelog
* Tue Feb 26 2008 Robert 'Bob' Jensen - 20080225-3
- Submit for review

* Tue Feb 26 2008 Robert 'Bob' Jensen - 20080225-2
- Add .desktop and icon for -gui package

* Tue Feb 26 2008 Robert 'Bob' Jensen - 20080225-1
- Version Update
- Verify patches still needed

* Mon Jan 07 2008 Robert 'Bob' Jensen - 20071210-1
- Version Update

* Mon Dec 10 2007 Sindre Pedersen Bjørdal - 20071205-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dxcc/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Feb 2008 17:06:35 -0000	1.1
+++ sources	29 Feb 2008 17:38:25 -0000	1.2
@@ -0,0 +1 @@
+74167d4afef980701fb2bac269117808  dxcc-20080225.tar.gz