diff --git a/.cvsignore b/.cvsignore index 3b5d845..ee8bd0a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -qle-0.0.13.tar.gz +qle-0.0.17.tar.gz diff --git a/qle-0.0.17-configlocation.patch b/qle-0.0.17-configlocation.patch new file mode 100644 index 0000000..07d2f3b --- /dev/null +++ b/qle-0.0.17-configlocation.patch @@ -0,0 +1,18 @@ +--- qle-0.0.17/qle-0.0.17.pl 2009-10-11 17:03:41.000000000 +0300 ++++ qle-0.0.17-mod/qle-0.0.17.pl 2009-11-27 22:19:56.000000000 +0200 +@@ -51,6 +51,7 @@ + # Build name of config file from name of executable file: + my ($progName, $pathName, $suffix) = fileparse("$0", qr/\.[^.]*/); + my $configFile; ++ my $pathName = "/etc/qle/"; + if (File::Spec->file_name_is_absolute($pathName)) { + $configFile = "$pathName" . "$progName" . ".conf"; + } else { +@@ -59,6 +60,7 @@ + $absPathName = $absPathName . "/"; + $configFile = "$absPathName" . "$progName" . ".conf"; + } ++print $configFile; + + + # Report name of executable in title bar (use target of symlink diff --git a/qle-0.0.17-sh.patch b/qle-0.0.17-sh.patch new file mode 100644 index 0000000..d0a98ca --- /dev/null +++ b/qle-0.0.17-sh.patch @@ -0,0 +1,25 @@ +diff -Naur qle-0.0.17/qle.sh qle-0.0.17-mod/qle.sh +--- qle-0.0.17/qle.sh 2009-10-11 17:03:41.000000000 +0300 ++++ qle-0.0.17-mod/qle.sh 2009-12-20 20:47:46.000000000 +0200 +@@ -1,3 +1,4 @@ ++#!/bin/bash + ##################################################################### + # + # Suggested start-up script for qle-.pl +@@ -13,6 +14,7 @@ + ##################################################################### + # + #cd ~/qle-0.0.17 ++cd /usr/share/qle + # + echo qle.sh: trying to kill lingering hamlib 'rigctld' servers: + killall rigctld +@@ -24,7 +26,7 @@ + # + echo qle.sh: starting up the 'qle' logger program: + # perl qle-0.0.17.pl -font "-adobe-avant garde gothic-demi-r-normal--0-0-0-0-p-0-iso8859-1" $1 $2 $3 $4 +-perl qle-0.0.17.pl -foreground Blue $1 $2 $3 $4 ++perl qle.pl -foreground Blue $1 $2 $3 $4 + # + echo qle.sh: killing 'rigctld' server: + killall rigctld diff --git a/qle-configlocation.patch b/qle-configlocation.patch deleted file mode 100644 index d2f2ccc..0000000 --- a/qle-configlocation.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up ./qle-0.0.13.pl.orig ./qle-0.0.13.pl ---- ./qle-0.0.13.pl.orig 2007-12-06 18:58:16.000000000 -0700 -+++ ./qle-0.0.13.pl 2007-12-06 18:58:32.000000000 -0700 -@@ -57,9 +57,10 @@ - my $sprogName = basename($progName); - $progName =~ s/^\.\///; # Zap leading './' - -- my $configFile = $progName; -- $configFile =~ s/.pl$//; -- $configFile = "$configFile.conf"; -+ my $configFile = "/etc/qle/qle.conf"; -+# my $configFile = $progName; -+# $configFile =~ s/.pl$//; -+# $configFile = "$configFile.conf"; - - my $copyRight = " - - diff --git a/qle-sh.patch b/qle-sh.patch deleted file mode 100644 index a4bac7c..0000000 --- a/qle-sh.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur qle-0.0.17/qle.sh qle-0.0.17-mod/qle.sh ---- qle-0.0.17/qle.sh 2009-10-11 17:03:41.000000000 +0300 -+++ qle-0.0.17-mod/qle.sh 2009-11-27 08:13:03.000000000 +0200 -@@ -13,6 +13,7 @@ - ##################################################################### - # - #cd ~/qle-0.0.17 -+cd /usr/share/qle - # - echo qle.sh: trying to kill lingering hamlib 'rigctld' servers: - killall rigctld -@@ -24,7 +25,7 @@ - # - echo qle.sh: starting up the 'qle' logger program: - # perl qle-0.0.17.pl -font "-adobe-avant garde gothic-demi-r-normal--0-0-0-0-p-0-iso8859-1" $1 $2 $3 $4 --perl qle-0.0.17.pl -foreground Blue $1 $2 $3 $4 -+perl qle.pl -foreground Blue $1 $2 $3 $4 - # - echo qle.sh: killing 'rigctld' server: - killall rigctld diff --git a/qle.desktop b/qle.desktop index 17ee89e..fb3b535 100644 --- a/qle.desktop +++ b/qle.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=qle GenericName=qle Comment=A QSO Logger and log Editor @@ -7,5 +6,5 @@ Exec=qle Icon=qle Terminal=false Type=Application -Categories=HamRadio; +Categories=Network;HamRadio; Version=1.0 diff --git a/qle.spec b/qle.spec index e91948e..2a1235f 100644 --- a/qle.spec +++ b/qle.spec @@ -1,6 +1,6 @@ Name: qle -Version: 0.0.13 -Release: 3%{?dist} +Version: 0.0.17 +Release: 1%{?dist} Summary: A QSO Logger and log Editor Group: Applications/Communications @@ -10,14 +10,14 @@ Source0: http://home.kpn.nl/w.knol18/%{name}/%{name}-%{version}.tar.gz Source1: qle.desktop Source2: qle.png #add script shebang & fix paths -Patch0: qle-sh.patch +Patch0: qle-0.0.17-sh.patch #Fix configuration path -Patch1: qle-configlocation.patch +Patch1: qle-0.0.17-configlocation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch - -Requires: perl, perl(DBI), perl(DBD::SQLite), perl(Tk) + +Requires: perl, perl(DBI), perl(DBD::SQLite), perl(Tk), perl(PDF-Create) #qle requires rigctld from hamlib for communicating with transciever Requires: hamlib Requires: cwdaemon @@ -46,8 +46,8 @@ updated accordingly. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch0 -p1 -b .sh +%patch1 -p1 -b .configlocation %build #no build needed @@ -86,6 +86,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Nov 27 2009 Lucian Langa - 0.0.17-1 +- improve desktop icon file (#530837) +- update patch0 +- new upstream release + * Sun Jul 26 2009 Fedora Release Engineering - 0.0.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 5138a90..9277950 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e2ef84c17fae06657111a964f2fd299 qle-0.0.13.tar.gz +54f2155fae9a5af0cdb45f1f67221c4d qle-0.0.17.tar.gz