[trustedqsl] Update to version 2.0.1.

Fri Dec 20 03:03:13 UTC 2013

commit 38e78897e75f9fea0cfd1b8cecf992580737a2e6
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Thu Dec 19 21:03:21 2013 -0600

    Update to version 2.0.1.
    
    - Add conditionals for EPEL-6.

 .gitignore                               |    1 +
 sources                                  |    2 +-
 tqsl-2.0-rpath.patch                     |   18 ++++++++++++
 tqsl-2.0.1-gcc44_pragma.patch            |   17 +++++++++++
 tqsl-rpath.patch                         |   22 --------------
 tqsl-tsqllib.patch => tqsl-tqsllib.patch |    0
 trustedqsl.spec                          |   45 ++++++++++++++++++++---------
 7 files changed, 68 insertions(+), 37 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 5702f93..2823bb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 TrustedQSL-1.11.tar.gz
 /TrustedQSL-1.13.tar.gz
 /tqsl-1.14.3.tar.gz
+/tqsl-2.0.1.tar.gz
diff --git a/sources b/sources
index 6f990a2..88d897f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f9317de671e9d8b5e71d883a5983135  tqsl-1.14.3.tar.gz
+4604ee81a35a48d59b03e6a2046db8a2  tqsl-2.0.1.tar.gz
diff --git a/tqsl-2.0-rpath.patch b/tqsl-2.0-rpath.patch
new file mode 100644
index 0000000..2d94f70
--- /dev/null
+++ b/tqsl-2.0-rpath.patch
@@ -0,0 +1,18 @@
+diff -Naur tqsl-2.0.orig/apps/CMakeLists.txt tqsl-2.0/apps/CMakeLists.txt
+--- tqsl-2.0.orig/apps/CMakeLists.txt	2013-10-20 19:33:20.000000000 -0500
++++ tqsl-2.0/apps/CMakeLists.txt	2013-11-27 21:13:43.212639040 -0600
+@@ -92,14 +92,6 @@
+ set(TQSL_RCFILE ${OSX_ICONFILE})
+ endif()
+ 
+-if(NOT WIN32) #rpath setup
+-SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+-endif()
+-
+-
+ set(TQSL_SRC tqsl.cpp extwizard.cpp tqslwiz.cpp dxcc.cpp stationdial.cpp
+ qsodatadialog.cpp tqslvalidator.cpp tqsl_prefs.cpp wxutil.cpp tqslhelp.cpp
+ crqwiz.cpp certtree.cpp getpassword.cpp loadcertwiz.cpp loctree.cpp)
diff --git a/tqsl-2.0.1-gcc44_pragma.patch b/tqsl-2.0.1-gcc44_pragma.patch
new file mode 100644
index 0000000..b9fe372
--- /dev/null
+++ b/tqsl-2.0.1-gcc44_pragma.patch
@@ -0,0 +1,17 @@
+diff -Naur tqsl-2.0.1.orig/apps/tqsl.cpp tqsl-2.0.1/apps/tqsl.cpp
+--- tqsl-2.0.1.orig/apps/tqsl.cpp	2013-12-15 07:54:43.000000000 -0600
++++ tqsl-2.0.1/apps/tqsl.cpp	2013-12-18 11:17:51.463517659 -0600
+@@ -2936,13 +2936,7 @@
+ // The macro for declaring a hash map defines a couple of typedefs
+ // that it never uses. Current GCC warns about those. The pragma
+ // below suppresses those warnings for those.
+-#if !defined(__APPLE__) && !defined(_WIN32)
+-	#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+-#endif
+ 			WX_DECLARE_STRING_HASH_MAP(wxString, URLHashMap);
+-#if !defined(__APPLE__) && !defined(_WIN32)
+-	#pragma GCC diagnostic warning "-Wunused-local-typedefs"
+-#endif
+ 			URLHashMap map;
+ 			ri->newProgramRev = NULL;
+ 			ri->newConfigRev = NULL;
diff --git a/tqsl-tsqllib.patch b/tqsl-tqsllib.patch
similarity index 100%
rename from tqsl-tsqllib.patch
rename to tqsl-tqsllib.patch
diff --git a/trustedqsl.spec b/trustedqsl.spec
index bdfb68f..16ebd3e 100644
--- a/trustedqsl.spec
+++ b/trustedqsl.spec
@@ -1,22 +1,34 @@
+# Because upstream is not good about bumping the library version for ABI
+# incompatible changes the Release should not be reset to 1 unless both version
+# numbers change, otherwise the NEVR of the library may cause a package not to
+# be updated even if it should be.
 %global srcname tqsl
-%global tqslver 1.14.3
-%global libtqslver 2.3
+%global tqslver 2.0.1
+%global libtqslver 2.4
+
+%{?rhel: %global cmake %{cmake28}}
 
 Name:           trustedqsl
 Version:        %{tqslver}
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        TrustedQSL ham-radio applications
 License:        BSD
 URL:            http://sourceforge.net/projects/trustedqsl/
 
 Source0:        http://downloads.sourceforge.net/%{name}/%{srcname}-%{version}.tar.gz
 
-Patch0:         tqsl-rpath.patch
-Patch1:         tqsl-tsqllib.patch
+Patch0:         tqsl-2.0-rpath.patch
+Patch1:         tqsl-tqsllib.patch
+Patch2:         tqsl-2.0.1-gcc44_pragma.patch
 
+%if 0%{?rhel}
+BuildRequires:  cmake28
+BuildRequires:  db4-devel
+%else
 BuildRequires:  cmake
-BuildRequires:  openssl-devel
 BuildRequires:  libdb-devel
+%endif
+BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
 BuildRequires:  expat-devel
 BuildRequires:  wxGTK-devel
@@ -58,6 +70,9 @@ contains the to develop with tqsllib.
 %setup -q -n %{srcname}-%{tqslver}
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .soname
+%if 0%{?rhel}
+%patch2 -p1 -b .pragma
+%endif
 
 
 %build
@@ -76,11 +91,8 @@ popd
 # Install desktop files
 mkdir -p %{buildroot}%{_datadir}/applications
 sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" apps/tqsl.desktop
-sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" apps/tqslcert.desktop
 desktop-file-install \
         --dir=%{buildroot}%{_datadir}/applications apps/tqsl.desktop
-desktop-file-install \
-        --dir=%{buildroot}%{_datadir}/applications apps/tqslcert.desktop
 
 # Install icons
 for size in 16 32 48 64 128; do
@@ -90,15 +102,15 @@ done
 
 
 %post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /sbin/ldconfig
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
+/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
-/sbin/ldconfig
 
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -107,13 +119,14 @@ fi
 %files
 %doc AUTHORS.txt LICENSE.txt README
 %{_bindir}/tqsl
-%{_bindir}/tqslcert
-%{_datadir}/applications/*tqsl*.desktop
+%{_datadir}/applications/tqsl.desktop
 %{_datadir}/icons/hicolor/*/apps/TrustedQSL.png
+%{_datadir}/pixmaps/TrustedQSL.png
+%{_datadir}/TrustedQSL
 %{_mandir}/man5/*.5*
 
 %files -n tqsllib
-%{_datadir}/TrustedQSL
+%doc src/LICENSE src/ChangeLog.txt
 %{_libdir}/libtqsllib.so.%{libtqslver}
 
 %files -n tqsllib-devel
@@ -122,6 +135,10 @@ fi
 
 
 %changelog
+* Thu Dec 19 2013 Richard Shaw <hobbes1069 at gmail.com> - 2.0.1-1
+- Update to version 2.0.1.
+- Add conditionals for EPEL-6.
+
 * Wed Sep 25 2013 Richard Shaw <hobbes1069 at gmail.com> - 1.14.3-1
 - Update to latest upstream release.
 - This package now provides tqsllib.
