rpms/trustedqsl/F-8 TrustedQSL-1.11-gcc43.patch, NONE, 1.1 TrustedQSL-1.11-icon.patch, NONE, 1.1 TrustedQSL-1.11-lib64.patch, NONE, 1.1 trustedqsl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Lucian Langa
lucilanga at fedoraproject.org
Mon Oct 13 05:13:13 UTC 2008
- Previous message (by thread): rpms/chntpw/F-10 chntpw-README.Dist, NONE, 1.1 chntpw-chntpw.8, NONE, 1.1 chntpw.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/ghc/devel ghc.spec,1.48,1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lucilanga
Update of /cvs/pkgs/rpms/trustedqsl/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26788
Modified Files:
.cvsignore sources
Added Files:
TrustedQSL-1.11-gcc43.patch TrustedQSL-1.11-icon.patch
TrustedQSL-1.11-lib64.patch trustedqsl.spec
Log Message:
initial import
TrustedQSL-1.11-gcc43.patch:
--- NEW FILE TrustedQSL-1.11-gcc43.patch ---
--- TrustedQSL-1.11/crqwiz.cpp 2005-03-11 14:47:06.000000000 +0200
+++ TrustedQSL-1.11-mod/crqwiz.cpp 2008-07-15 12:07:42.000000000 +0300
@@ -104,7 +104,7 @@
CRQ_ProviderPage::DoUpdateInfo() {
int sel = tc_provider->GetSelection();
if (sel >= 0) {
- int idx = (int)(tc_provider->GetClientData(sel));
+ long idx = (long)(tc_provider->GetClientData(sel));
if (idx >=0 && idx < (int)providers.size()) {
Parent()->provider = providers[idx];
wxString info;
@@ -521,7 +521,7 @@
}
ok = (ok && havealpha && havenumeric);
}
- Parent()->dxcc = (int)(tc_dxcc->GetClientData(tc_dxcc->GetSelection()));
+ Parent()->dxcc = (long)(tc_dxcc->GetClientData(tc_dxcc->GetSelection()));
if (Parent()->dxcc < 0) {
msg = wxT("You must select a DXCC entity.");
ok = false;
TrustedQSL-1.11-icon.patch:
--- NEW FILE TrustedQSL-1.11-icon.patch ---
--- TrustedQSL-1.11/left.xpm 2003-05-30 17:54:29.000000000 +0300
+++ TrustedQSL-1.11-mod/left.xpm 2008-07-13 16:15:47.000000000 +0300
@@ -1,5 +1,5 @@
/* XPM */
-static char *left[]={
+static char *ico_left[]={
"10 10 29 1",
". c None",
"d c #000000",
--- TrustedQSL-1.11/qsodatadialog.cpp 2005-02-18 18:38:58.000000000 +0200
+++ TrustedQSL-1.11-mod/qsodatadialog.cpp 2008-07-13 16:15:32.000000000 +0300
@@ -302,13 +302,13 @@
sizer = new wxBoxSizer(wxHORIZONTAL);
_recbottom_ctrl = new wxBitmapButton(this, QD_RECBOTTOM, wxBitmap(bottom), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)),
sizer->Add(_recbottom_ctrl, 0, wxTOP|wxBOTTOM, 5);
- _recdown_ctrl = new wxBitmapButton(this, QD_RECDOWN, wxBitmap(left), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
+ _recdown_ctrl = new wxBitmapButton(this, QD_RECDOWN, wxBitmap(ico_left), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
sizer->Add(_recdown_ctrl, 0, wxTOP|wxBOTTOM, 5);
_recno_ctrl = new wxTextCtrl(this, QD_RECNO, wxT("1"), wxDefaultPosition,
wxSize(4*TEXT_WIDTH,TEXT_HEIGHT));
_recno_ctrl->Enable(FALSE);
sizer->Add(_recno_ctrl, 0, wxALL, 5);
- _recup_ctrl = new wxBitmapButton(this, QD_RECUP, wxBitmap(right), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
+ _recup_ctrl = new wxBitmapButton(this, QD_RECUP, wxBitmap(ico_right), wxDefaultPosition, wxSize(18, TEXT_HEIGHT));
sizer->Add(_recup_ctrl, 0, wxTOP|wxBOTTOM, 5);
_rectop_ctrl = new wxBitmapButton(this, QD_RECTOP, wxBitmap(top), wxDefaultPosition, wxSize(18, TEXT_HEIGHT)),
sizer->Add(_rectop_ctrl, 0, wxTOP|wxBOTTOM, 5);
--- TrustedQSL-1.11/right.xpm 2003-05-30 17:54:29.000000000 +0300
+++ TrustedQSL-1.11-mod/right.xpm 2008-07-13 16:16:07.000000000 +0300
@@ -1,5 +1,5 @@
/* XPM */
-static char *right[]={
+static char *ico_right[]={
"10 10 30 1",
"a c None",
"g c #000000",
TrustedQSL-1.11-lib64.patch:
--- NEW FILE TrustedQSL-1.11-lib64.patch ---
--- TrustedQSL-1.11/configure 2005-03-11 15:28:36.000000000 +0200
+++ TrustedQSL-1.11-mod/configure 2008-10-10 22:18:41.000000000 +0300
@@ -4057,7 +4057,7 @@
checkexpatdir(){
if test -z "$EXPAT"; then
- if test -e "$1/lib/libexpat.a" || test -e "$1/lib/libexpat$dyn_lib_suf"; then
+ if test -e "$1/lib/libexpat.a" || test -e "$1/lib/libexpat$dyn_lib_suf" || test -e "$1/lib64/libexpat.a" || test -e "$1/lib64/libexpat$dyn_lib_suf"; then
EXPAT="$1"
fi
fi
@@ -4073,7 +4073,7 @@
checkzlibdir(){
if test -z "$ZLIB"; then
- if test -e "$1/lib/libz.a" || test -e "$1/lib/libz$dyn_lib_suf"; then
+ if test -e "$1/lib/libz.a" || test -e "$1/lib/libz$dyn_lib_suf" || test -e "$1/lib64/libz.a" || test -e "$1/lib64/libz$dyn_lib_suf"; then
ZLIB="$1"
fi
fi
--- NEW FILE trustedqsl.spec ---
Name: trustedqsl
Version: 1.11
Release: 2%{?dist}
Summary: TrustedQSL ham-radio applications
Group: Applications/Communications
License: BSD
URL: http://sourceforge.net/projects/trustedqsl/
Source: http://downloads.sourceforge.net/%{name}/TrustedQSL-%{version}.tar.gz
#left and right are reserved words, submited upstream
Patch0: TrustedQSL-1.11-icon.patch
#losing precision when doing void -> int, submited upstream
Patch1: TrustedQSL-1.11-gcc43.patch
#zlib, expat detection for x86_64
Patch2: TrustedQSL-1.11-lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: tqsllib >= 1.2
BuildRequires: tqsllib-devel, wxGTK-devel, zlib-devel
BuildRequires: expat-devel, desktop-file-utils
%description
The TrustedQSL applications are used for generating digitally signed
QSO records (records of Amateur Radio contacts). This package
contains the GUI applications tqslcert and tqsl.
%prep
%setup -q -n TrustedQSL-%{version}
%patch0 -p1 -b .icon
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .lib64
%build
#again detetction is broken for ssl and tqsl
export OPENSSL=/usr
export TQSLLIB=/usr
%configure --without-openssl --without-tqsllib
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR="%{buildroot}" INSTALL="install -p"
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/pixmaps
cp icons/key48.png %{buildroot}%{_datadir}/pixmaps/TrustedQSL.png
sed -i -e "s/.png//g" -e "s/Application;//g" -e "s/Utility;//g" tqsl.desktop
sed -i -e "s/.png//g" -e "s/Application;//g" -e "s/Utility;//g" tqslcert.desktop
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications tqsl.desktop
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications tqslcert.desktop
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc ChangeLog LICENSE help/*
%{_bindir}/tqsl
%{_bindir}/tqslcert
%{_datadir}/TrustedQSL/help/*
%{_datadir}/applications/*tqsl*.desktop
%{_datadir}/pixmaps/TrustedQSL.png
%changelog
* Fri Oct 10 2008 Lucian Langa <cooly at gnome.eu.org> - 1.11-2
- misc cleanups
- update buildrequires
- package missing docs
* Sun Jul 13 2008 Lucian Langa <lucilanga at gnome.org> - 1.11-1
- initial spec file for fedora
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustedqsl/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Oct 2008 01:55:36 -0000 1.1
+++ .cvsignore 13 Oct 2008 05:12:42 -0000 1.2
@@ -0,0 +1 @@
+TrustedQSL-1.11.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustedqsl/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Oct 2008 01:55:36 -0000 1.1
+++ sources 13 Oct 2008 05:12:42 -0000 1.2
@@ -0,0 +1 @@
+2b39274763ec27823489f2eca975fdab TrustedQSL-1.11.tar.gz
- Previous message (by thread): rpms/chntpw/F-10 chntpw-README.Dist, NONE, 1.1 chntpw-chntpw.8, NONE, 1.1 chntpw.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/ghc/devel ghc.spec,1.48,1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list