rpms/qle/F-11 qle-0.0.18-configlocation.patch, 1.1, 1.2 qle-0.0.18-sh.patch, 1.1, 1.2 qle.spec, 1.4, 1.5
Lucian Langa
lucilanga at fedoraproject.org
Sun Jan 10 21:24:32 UTC 2010
Author: lucilanga
Update of /cvs/pkgs/rpms/qle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv762
Modified Files:
qle-0.0.18-configlocation.patch qle-0.0.18-sh.patch qle.spec
Log Message:
* Sun Jan 10 2010 Lucian Langa <cooly at gnome.eu.org> - 0.0.18-3
- sh wrapper support for multiuser
qle-0.0.18-configlocation.patch:
qle-0.0.18.pl | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
Index: qle-0.0.18-configlocation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qle/F-11/qle-0.0.18-configlocation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qle-0.0.18-configlocation.patch 9 Jan 2010 15:57:08 -0000 1.1
+++ qle-0.0.18-configlocation.patch 10 Jan 2010 21:24:32 -0000 1.2
@@ -1,12 +1,61 @@
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 @@
++++ qle-0.0.18-mod/qle-0.0.18.pl 2010-01-10 22:52:53.000000000 +0200
+@@ -50,6 +50,7 @@
+
# Build name of config file from name of executable file:
my ($progName, $pathName, $suffix) = fileparse("$0", qr/\.[^.]*/);
- my $configFile;
+ my $pathName = "/etc/qle/";
+ my $configFile;
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
+@@ -883,8 +884,14 @@
+ $doScp = process_scp( \@scpArray, $config{masterScp} );
+ }
+ else {
+- print "Can't read super check partial file $config{masterScp}\n",
+- "No super check partial.\n";
++ stat ( "/usr/share/qle/$config{masterScp}" );
++ if ( -r _ ) {
++ $doScp = process_scp( \@scpArray, "/usr/share/qle/$config{masterScp}" );
++ }
++ else {
++ print "Can't read super check partial file $config{masterScp}\n",
++ "No super check partial.\n";
++ }
+ }
+
+ my $scpWindow;
+@@ -928,7 +935,13 @@
+ \%ituzHash, $config{ctyDat} );
+ }
+ else {
+- print "Can't read cty.dat file $config{ctyDat}\n";
++ stat ( "/usr/share/qle/$config{ctyDat}" );
++ if (-r _) {
++ process_cty_dat( \%ctyHash, \%contHash, \%cqzHash,
++ \%ituzHash, "/usr/share/qle/$config{ctyDat}" );
++ } else {
++ print "Can't read cty.dat file $config{ctyDat}\n";
++ }
+ }
+
+ # Set up frame, used for entering new QSOs:
+@@ -6643,7 +6656,7 @@
+ use Tk::Bitmap;
+
+ # use Tk::Image;
+- my $kiwi = "kiwi-blk-52x52.xbm";
++ my $kiwi = "/usr/share/qle/kiwi-blk-52x52.xbm";
+ my $image = $window->Bitmap( -file => $kiwi )
+ or warn "Image file $kiwi not found :-( \n";
+
+@@ -7323,7 +7336,7 @@
+ # subroutine process_scp
+ #
+ # Purpose: Reads file $config{masterScp}, turning the info into an
+-# array.
++# array
+ #
+ # Args:
+ # Reference to super check partial array
qle-0.0.18-sh.patch:
qle.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Index: qle-0.0.18-sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qle/F-11/qle-0.0.18-sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qle-0.0.18-sh.patch 9 Jan 2010 15:57:08 -0000 1.1
+++ qle-0.0.18-sh.patch 10 Jan 2010 21:24:32 -0000 1.2
@@ -1,25 +1,19 @@
+diff -Naur qle-0.0.18/qle-0.0.18.pl qle-0.0.18-mod/qle-0.0.18.pl
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-<version>.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 @@
++++ qle-0.0.18-mod/qle.sh 2010-01-10 23:00:13.000000000 +0200
+@@ -22,9 +22,13 @@
+ #rigctld -m314 -s1200 -r/dev/ttyUSB2 &
+ rigctld -m129 -s4800 -r/dev/ttyUSB1 &
#
++
++test -f foo3.db || cp /usr/share/qle/foo3.db .
++test -f dupeID || cp /usr/share/qle/dupeID .
++
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
++perl /usr/share/qle/qle.pl -foreground Blue $1 $2 $3 $4
#
echo qle.sh: killing 'rigctld' server:
killall rigctld
Index: qle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qle/F-11/qle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qle.spec 9 Jan 2010 15:57:08 -0000 1.4
+++ qle.spec 10 Jan 2010 21:24:32 -0000 1.5
@@ -1,6 +1,6 @@
Name: qle
Version: 0.0.18
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: A QSO Logger and log Editor
Group: Applications/Communications
@@ -56,6 +56,7 @@ updated accordingly.
rm -rf $RPM_BUILD_ROOT
install -p -D -m 0644 kiwi-blk-52x52.xbm $RPM_BUILD_ROOT%{_datadir}/%{name}/kiwi-blk-52x52.xbm
install -p -D -m 0644 foo3.db $RPM_BUILD_ROOT%{_datadir}/%{name}/foo3.db
+install -p -D -m 0644 dupeID $RPM_BUILD_ROOT%{_datadir}/%{name}/dupeID
install -p -D -m 0755 adifimport.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/adifimport.pl
install -p -D -m 0755 cabrilloimport.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/cabrilloimport.pl
install -p -D -m 0755 qle-%{version}.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/qle.pl
@@ -86,6 +87,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jan 10 2010 Lucian Langa <cooly at gnome.eu.org> - 0.0.18-3
+- sh wrapper support for multiuser
+
+* Sun Jan 10 2010 Lucian Langa <cooly at gnome.eu.org> - 0.0.18-2
+- install dupeID
+
* Sat Jan 09 2010 Lucian Langa <cooly at gnome.eu.org> - 0.0.18-1
- new upstream release
More information about the scm-commits
mailing list