[trustedqsl] Update to latest upstream release.

Richard Shaw hobbes1069 at fedoraproject.org
Mon Jul 7 13:21:59 UTC 2014


commit 5d6026b574227b5f7db13ea5eb59e99d1582b6aa
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Jul 7 08:22:14 2014 -0500

    Update to latest upstream release.

 .gitignore           |    1 +
 sources              |    2 +-
 tqsl-2.0-rpath.patch |   21 ++++++++++-----------
 trustedqsl.spec      |   10 ++++++----
 4 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2823bb1..63d3ea1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ TrustedQSL-1.11.tar.gz
 /TrustedQSL-1.13.tar.gz
 /tqsl-1.14.3.tar.gz
 /tqsl-2.0.1.tar.gz
+/tqsl-2.0.2.tar.gz
diff --git a/sources b/sources
index 88d897f..15365df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4604ee81a35a48d59b03e6a2046db8a2  tqsl-2.0.1.tar.gz
+83df70e03d26e31ad2a3c06ccaa9d63d  tqsl-2.0.2.tar.gz
diff --git a/tqsl-2.0-rpath.patch b/tqsl-2.0-rpath.patch
index 2d94f70..8e1a888 100644
--- a/tqsl-2.0-rpath.patch
+++ b/tqsl-2.0-rpath.patch
@@ -1,18 +1,17 @@
-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})
+diff -Naur tqsl-2.0.2.orig/apps/CMakeLists.txt tqsl-2.0.2/apps/CMakeLists.txt
+--- tqsl-2.0.2.orig/apps/CMakeLists.txt	2014-04-21 11:41:48.000000000 -0500
++++ tqsl-2.0.2/apps/CMakeLists.txt	2014-04-25 12:56:15.735834887 -0500
+@@ -119,13 +119,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")
+-	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/trustedqsl.spec b/trustedqsl.spec
index 4450df1..f769c04 100644
--- a/trustedqsl.spec
+++ b/trustedqsl.spec
@@ -3,14 +3,14 @@
 # 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 2.0.1
+%global tqslver 2.0.2
 %global libtqslver 2.4
 
 %{?rhel: %global cmake %{cmake28}}
 
 Name:           trustedqsl
 Version:        %{tqslver}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        TrustedQSL ham-radio applications
 License:        BSD
 URL:            http://sourceforge.net/projects/trustedqsl/
@@ -36,7 +36,6 @@ BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 
 Requires:       curl
-Requires:       hicolor-icon-theme
 
 %description
 The TrustedQSL applications are used for generating digitally signed
@@ -95,7 +94,7 @@ desktop-file-install \
 # Install icons
 for size in 16 32 48 64 128; do
     install -Dpm 0644 apps/icons/key${size}.png \
-        %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/TrustedQSL.png
+    %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/TrustedQSL.png
 done
 
 
@@ -133,6 +132,9 @@ fi
 
 
 %changelog
+* Mon Jul  7 2014 Richard Shaw <hobbes1069 at gmail.com> - 2.0.2-1
+- Update to latest upstream release.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list