rpms/klog/F-12 import.log, NONE, 1.1 klog-0.5.6.CMakeList.txt.patch, NONE, 1.1 klog-0.5.6.desktop.patch, NONE, 1.1 klog.sh.in, NONE, 1.1 klog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue Jul 20 04:30:49 UTC 2010

Author: dp67

Update of /cvs/pkgs/rpms/klog/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28665

Modified Files:
	.cvsignore sources 
Added Files:
	import.log klog-0.5.6.CMakeList.txt.patch 
	klog-0.5.6.desktop.patch klog.sh.in klog.spec 
Log Message:

Added files for F-12

--- NEW FILE import.log ---
klog-0_5_6-4_fc13:HEAD:klog-0.5.6-4.fc13.src.rpm:1279596338

klog-0.5.6.CMakeList.txt.patch:
 CMakeLists.txt     |    1 +
 src/CMakeLists.txt |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE klog-0.5.6.CMakeList.txt.patch ---
diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
--- ./CMakeLists.txt.orig	2010-07-04 14:47:46.000000000 -0400
+++ ./CMakeLists.txt	2010-07-04 17:29:31.209976534 -0400
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 2.8.0)
 project(klog)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
diff -up ./src/CMakeLists.txt.orig ./src/CMakeLists.txt
--- ./src/CMakeLists.txt.orig	2010-07-04 14:47:46.000000000 -0400
+++ ./src/CMakeLists.txt	2010-07-04 17:30:48.063976347 -0400
@@ -28,7 +28,7 @@ kde4_add_ui_files(klog_SRCS klog.ui setu
 qt4_add_resources (klog_SRCS ../klog-resources.qrc )
 kde4_add_executable(klog ${klog_SRCS})
 
-target_link_libraries(klog ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${HAMLIB_LIBRARY} )
+target_link_libraries(klog ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${HAMLIB_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
 
 install(TARGETS klog DESTINATION ${BIN_INSTALL_DIR})
 

klog-0.5.6.desktop.patch:
 klog.desktop |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE klog-0.5.6.desktop.patch ---
diff -up ./src/klog.desktop.orig ./src/klog.desktop
--- ./src/klog.desktop.orig	2010-07-04 14:47:46.000000000 -0400
+++ ./src/klog.desktop	2010-07-16 12:55:02.586321828 -0400
@@ -1,10 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=KLog
+GenericName=klog
 Comment=KDE Ham Radio logging program
 Comment[es]=Programa de log para radioaficionados de KDE
 Exec=klog
-Icon=klog-icon.png
+Icon=klog-icon
 Terminal=false
 Type=Application
-Categories=Utility;Database;HamRadio;KDE
\ No newline at end of file
+Categories=Network;HamRadio;
+Version=1.0


--- NEW FILE klog.sh.in ---
#!/bin/sh
# *****************************************************************************
#               klog.sh.in  -  Install wrapper script for klog
#                            -------------------
#    begin                : June  25 2010
#    copyright            : (C) 2010 by Randall J. Berry N3LRX
#    email                : dp67 at fedoraproject.org
# *****************************************************************************
# *****************************************************************************
# *                                                                           *
# *  This program is free software; you can redistribute it and/or modify     *
# *  it under the terms of the GNU General Public License as published by     *
# *  the Free Software Foundation; either GPL version 2 of the License, or    *
# *  (at your option) any later version.                                      *
# *                                                                           *
# *  This program is distributed in the hope that it will be useful,          *
# *  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             *
# *  GNU General Public License for more details.                             *
# *                                                                           *
# *  You should have received a copy of the GNU General Public License        *
# *  along with this program; if not, write to the Free Software              *
# *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA  *
# *                                                                           *
# *****************************************************************************

# Wrapper script for klog to ensure that configuration is present
klogbin="/usr/libexec/klog-bin"
# Check if user configuration is present
if [ ! -e ~/.klog/ ]
then
mkdir ~/.klog
cp /etc/skel/.klog/data/klog-contest-cabrillo-formats.txt ~/.klog/klog-contest-cabrillo-formats.txt
cp /etc/skel/.klog/awa/tpea.awa ~/.klog/tpea.awa
cp /etc/skel/.klog/awa/was.awa ~/.klog/was.awa
cp /etc/skel/.klog/data/cty.dat ~/.klog/cty.dat
cp /etc/skel/.klog/data/cty.dat ~/.klog/klog-contest-cabrillo-formats.txt

fi
# Launch klog
$klogbin


--- NEW FILE klog.spec ---
Name:		klog
Version:	0.5.6
Release:	4%{?dist}
Summary:	A Ham radio logging program for KDE

Group:		Applications/Communications
License:	GPLv2+
URL:		http://jaime.robles.es/eklog.php
Source0:	http://jaime.robles.es/%{name}/download/%{name}-%{version}.tar.gz
# Wrapper script installs needed files in users home directory.
Source1:	%{name}.sh.in
# Patch CMakeLists.txt
Patch0:		%{name}-%{version}.CMakeList.txt.patch
# Patch .desktop file
Patch1:		%{name}-%{version}.desktop.patch

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

BuildRequires:	qt4-devel
BuildRequires:	hamlib-devel
BuildRequires:	cmake
BuildRequires:	kdelibs-devel
BuildRequires:	gettext
BuildRequires:	desktop-file-utils

%description
# Spelling intentional ignore rpmlint warnings.
KLog is a Ham radio logging program for KDE
Some features include:
	* DXCC award support.
	* Basic IOTA support.
	* Importing from Cabrillo files.
	* Importing from TLF.
	* Adding/Editing QSOs.
	* Save/read to/from disk file the log - ADIF format by default.
	* English/Spanish/Portuguese/Galician/Serbian/Swedish support.
	* QSL sent/received support.
	* Read/Write ADIF.
	* Delete QSOs.
	* DX-Cluster support. 
Some additional features of this application are still under development
and are not yet implemented.

%prep
%setup -q
%patch0 -p1 -b %{name}-%{version}.CMakeList.txt.patch
%patch1 -p1 -b %{name}-%{version}.desktop.patch

%build
%cmake \
	-DCMAKE_INSTALL_PREFIX=/usr

make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

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

%find_lang %{name}

# Install default user configuration files
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/skel/.%{name}/data/
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/skel/.%{name}/awa/
install -p -D -m 0644 ./awa/tpea.awa $RPM_BUILD_ROOT/%{_sysconfdir}/skel/.%{name}/awa/tpea.awa
install -p -D -m 0644 ./awa/was.awa $RPM_BUILD_ROOT/%{_sysconfdir}/skel/.%{name}/awa/was.awa
install -p -D -m 0644 ./data/cty.dat $RPM_BUILD_ROOT/%{_sysconfdir}/skel/.%{name}/data/cty.dat
install -p -D -m 0644 ./data/%{name}-contest-cabrillo-formats.txt $RPM_BUILD_ROOT/%{_sysconfdir}/skel/.%{name}/data/%{name}-contest-cabrillo-formats.txt

# Install the provided .desktop icon
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
install -p -D -m 0644 ./icons/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}-icon.png

desktop-file-install \
	--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
	$RPM_BUILD_ROOT/%{_datadir}/applications/kde4/%{name}.desktop

# Move original binary to libexecdir
mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/
mv $RPM_BUILD_ROOT/%{_bindir}/%{name} $RPM_BUILD_ROOT/%{_libexecdir}/%{name}-bin

# Install wrapper script installs needed files in users home directory.
install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING INSTALL README TODO NEWS
%{_bindir}/%{name}
%{_libexecdir}/%{name}-bin
%{_datadir}/pixmaps/%{name}-icon.png
%{_datadir}/applications/kde4/%{name}.desktop
%{_datadir}/icons/locolor/16x16/apps/%{name}.png
%{_datadir}/icons/locolor/32x32/apps/%{name}.png
%{_datadir}/kde4/apps/%{name}/klogui.rc
%dir %{_sysconfdir}/skel/.%{name}/
%dir %{_sysconfdir}/skel/.%{name}/data/
%dir %{_sysconfdir}/skel/.%{name}/awa/
%config(noreplace) %{_sysconfdir}/skel/.%{name}/data/%{name}-contest-cabrillo-formats.txt
%config(noreplace) %{_sysconfdir}/skel/.%{name}/data/cty.dat
%config(noreplace) %{_sysconfdir}/skel/.%{name}/awa/was.awa
%config(noreplace) %{_sysconfdir}/skel/.%{name}/awa/tpea.awa
#No man page for klog yet.

%changelog
* Sat Jul 17 2010 Randall J. Berry, N3LRX <dp67 at fedoraproject.org>  - 0.5.6-4
- Edit spec per review

* Fri Jul 16 2010 Randall J. Berry, N3LRX <dp67 at fedoraproject.org>  - 0.5.6-3
- Added desktop-file-install/validate per review
- Fixed unowned directories per review

* Mon Jul 12 2010 Randall J. Berry, N3LRX <dp67 at fedoraproject.org>  - 0.5.6-2
- Forgot to apply locale files.

* Sun Jul 4 2010 Randall J. Berry, N3LRX <dp67 at fedoraproject.org>  - 0.5.6-1
- Upstream Update 0.5.6
- Fixes spurious-executables
- Submit for review

* Mon Jun 28 2010 Randall J. Berry, N3LRX <dp67 at fedoraproject.org>  - 0.5.5-1
- First spec build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/klog/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Jul 2010 03:23:30 -0000	1.1
+++ .cvsignore	20 Jul 2010 04:30:48 -0000	1.2
@@ -0,0 +1 @@
+klog-0.5.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/klog/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Jul 2010 03:23:30 -0000	1.1
+++ sources	20 Jul 2010 04:30:48 -0000	1.2
@@ -0,0 +1 @@
+f471873f9a548d8960a50c6c8f8da01f  klog-0.5.6.tar.gz

