diff --git a/.cvsignore b/.cvsignore index ee8bd0a..eeccf30 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -qle-0.0.17.tar.gz +qle-0.0.18.tar.gz diff --git a/qle-0.0.17-configlocation.patch b/qle-0.0.17-configlocation.patch deleted file mode 100644 index 07d2f3b..0000000 --- a/qle-0.0.17-configlocation.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index d0a98ca..0000000 --- a/qle-0.0.17-sh.patch +++ /dev/null @@ -1,25 +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-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-0.0.18-configlocation.patch b/qle-0.0.18-configlocation.patch new file mode 100644 index 0000000..ef44c35 --- /dev/null +++ b/qle-0.0.18-configlocation.patch @@ -0,0 +1,12 @@ +diff -Naur qle-0.0.18/qle-0.0.18.pl qle-0.0.18-mod/qle-0.0.18.pl +--- qle-0.0.18/qle-0.0.18.pl 2009-12-21 19:13:12.000000000 +0200 ++++ qle-0.0.18-mod/qle-0.0.18.pl 2010-01-09 17:30:37.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 { +diff -Naur qle-0.0.18/qle.sh qle-0.0.18-mod/qle.sh diff --git a/qle-0.0.18-sh.patch b/qle-0.0.18-sh.patch new file mode 100644 index 0000000..774170e --- /dev/null +++ b/qle-0.0.18-sh.patch @@ -0,0 +1,25 @@ +diff -Naur qle-0.0.18/qle.sh qle-0.0.18-mod/qle.sh +--- qle-0.0.18/qle.sh 2009-12-21 19:13:12.000000000 +0200 ++++ qle-0.0.18-mod/qle.sh 2010-01-09 17:35:40.000000000 +0200 +@@ -1,3 +1,4 @@ ++#!/bin/bash + ##################################################################### + # + # Suggested start-up script for qle-.pl +@@ -13,6 +14,7 @@ + ##################################################################### + # + #cd ~/qle-0.0.18 ++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.18.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.18.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.spec b/qle.spec index 0ccb13d..7b3abec 100644 --- a/qle.spec +++ b/qle.spec @@ -1,6 +1,6 @@ Name: qle -Version: 0.0.17 -Release: 2%{?dist} +Version: 0.0.18 +Release: 1%{?dist} Summary: A QSO Logger and log Editor Group: Applications/Communications @@ -10,9 +10,9 @@ 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-0.0.17-sh.patch +Patch0: qle-0.0.18-sh.patch #Fix configuration path -Patch1: qle-0.0.17-configlocation.patch +Patch1: qle-0.0.18-configlocation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS BUGS NEWS README TODO COPYING +%doc AUTHORS BUGS NEWS README COPYING %dir /etc/%{name} %config(noreplace) /etc/%{name}/%{name}.conf %{_bindir}/%{name} @@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 09 2010 Lucian Langa - 0.0.18-1 +- new upstream release + * Mon Dec 21 2009 Lucian Langa - 0.0.17-2 - fix build requires diff --git a/sources b/sources index 9277950..beab4ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54f2155fae9a5af0cdb45f1f67221c4d qle-0.0.17.tar.gz +8a52a403cda8be2454427164c9b75f03 qle-0.0.18.tar.gz