diff --git a/.gitignore b/.gitignore index 68c4da8..5702f93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ TrustedQSL-1.11.tar.gz /TrustedQSL-1.13.tar.gz +/tqsl-1.14.3.tar.gz diff --git a/TrustedQSL-1.11-lib64.patch b/TrustedQSL-1.11-lib64.patch deleted file mode 100644 index 3b3568b..0000000 --- a/TrustedQSL-1.11-lib64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 diff --git a/sources b/sources index 16a7d0f..6f990a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65c7570a963c4f9d98435f154eba9a25 TrustedQSL-1.13.tar.gz +9f9317de671e9d8b5e71d883a5983135 tqsl-1.14.3.tar.gz diff --git a/tqsl-rpath.patch b/tqsl-rpath.patch new file mode 100644 index 0000000..eaec0ee --- /dev/null +++ b/tqsl-rpath.patch @@ -0,0 +1,22 @@ +diff -Naur tqsl-1.14.3.orig/apps/CMakeLists.txt tqsl-1.14.3/apps/CMakeLists.txt +--- tqsl-1.14.3.orig/apps/CMakeLists.txt 2013-06-25 20:13:14.000000000 -0500 ++++ tqsl-1.14.3/apps/CMakeLists.txt 2013-09-15 09:53:05.772318882 -0500 +@@ -72,12 +72,12 @@ + set(TQSLCERT_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() ++#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(TQSLCERT_SRC tqslcert.cpp crqwiz.cpp dxcc.cpp certtree.cpp tqslcert_prefs.cpp getpassword.cpp extwizard.cpp loadcertwiz.cpp wxutil.cpp) diff --git a/tqsl-tsqllib.patch b/tqsl-tsqllib.patch new file mode 100644 index 0000000..685aacb --- /dev/null +++ b/tqsl-tsqllib.patch @@ -0,0 +1,17 @@ +diff -Naur tqsl-1.14.3.orig/src/CMakeLists.txt tqsl-1.14.3.soname/src/CMakeLists.txt +--- tqsl-1.14.3.orig/src/CMakeLists.txt 2013-06-25 20:13:14.000000000 -0500 ++++ tqsl-1.14.3.soname/src/CMakeLists.txt 2013-09-15 10:00:23.063629431 -0500 +@@ -51,10 +51,12 @@ + target_link_libraries(${TQSLLIBNAME} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES} ${BDB_LIBRARIES} ${CARBON_LIBRARY}) + include_directories(${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${EXPAT_INCLUDE_DIR} ${BDB_INCLUDE_DIR} ${CARBON_INCLUDE_DIR}) + ++set_target_properties(${TQSLLIBNAME} PROPERTIES SOVERSION ${TQSLLIB_VERSION}) ++ + if(NOT APPLE AND NOT WIN32) + set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/") + set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h) +-install(TARGETS tqsllib DESTINATION lib) ++install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX}) + install(FILES config.xml DESTINATION share/TrustedQSL) + install(FILES ${HEADERS_TO_INSTALL} DESTINATION include) + endif() diff --git a/trustedqsl.spec b/trustedqsl.spec index b574f0b..416a011 100644 --- a/trustedqsl.spec +++ b/trustedqsl.spec @@ -1,61 +1,128 @@ -Name: trustedqsl -Version: 1.13 -Release: 6%{?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 -Patch0: TrustedQSL-1.11-lib64.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tqsllib >= 2.2 -BuildRequires: tqsllib-devel >= 2.2, wxGTK-devel, zlib-devel -BuildRequires: expat-devel, desktop-file-utils +%global srcname tqsl +%global tqslver 1.14.3 +%global libtqslver 2.3 + +Name: trustedqsl +Version: %{tqslver} +Release: 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 + +BuildRequires: openssl-devel +BuildRequires: libdb-devel +BuildRequires: wxGTK-devel +BuildRequires: zlib-devel +BuildRequires: desktop-file-utils + +Requires: curl +Requires: hicolor-icon-theme %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. +%package -n tqsllib +Version: %libtqslver +Summary: TrustedQSL library +Obsoletes: tqsllib < 2.2-8 + +%description -n tqsllib +The TrustedQSL library is used for generating digitally signed +QSO records (records of Amateur Radio contacts). This package +contains the library and configuration files needed to run +TrustedQSL applications. + +%package -n tqsllib-devel +Version: %libtqslver +Summary: Development files the for TrustedQSL library +Requires: tqsllib%{?_isa} = %{version}-%{release} +Obsoletes: tqsllib-devel < 2.2-8 + +%description -n tqsllib-devel +The TrustedQSL library is used for generating digitally signed +QSO records (records of Amateur Radio contacts). This package +contains the to develop with tqsllib. + + %prep -%setup -q -n TrustedQSL-%{version} -%patch0 -p1 -b .lib64 +%setup -q -n %{srcname}-%{tqslver} +%patch0 -p1 -b .rpath +%patch1 -p1 -b .soname + %build -#again detetction is broken for ssl and tqsl -export OPENSSL=/usr -export TQSLLIB=/usr -%configure --without-openssl --without-tqsllib +rm -rf build && mkdir build && pushd build +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + ../ + make %{?_smp_mflags} + %install -rm -rf %{buildroot} -make install DESTDIR="%{buildroot}" INSTALL="install -p" +pushd build +%make_install +popd + +# Install desktop files 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;/Network;/g" -e "s/Utility;/GTK;/g" tqsl.desktop -sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" tqslcert.desktop +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 tqsl.desktop + --dir=%{buildroot}%{_datadir}/applications apps/tqsl.desktop desktop-file-install \ - --dir=%{buildroot}%{_datadir}/applications tqslcert.desktop + --dir=%{buildroot}%{_datadir}/applications apps/tqslcert.desktop +# 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 +done -%clean -rm -rf %{buildroot} -%files -%defattr(-,root,root,-) -%doc ChangeLog LICENSE help/* +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/sbin/ldconfig + +%postun +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 || : + + +%files +%doc AUTHORS.txt LICENSE.txt README %{_bindir}/tqsl %{_bindir}/tqslcert -%{_datadir}/TrustedQSL %{_datadir}/applications/*tqsl*.desktop -%{_datadir}/pixmaps/TrustedQSL.png +%{_datadir}/icons/hicolor/*/apps/TrustedQSL.png +%{_mandir}/man5/*.5* + +%files -n tqsllib +%{_datadir}/TrustedQSL +%{_libdir}/libtqsllib.so.%{libtqslver} + +%files -n tqsllib-devel +%{_includedir}/* +%{_libdir}/libtqsllib.so + %changelog +* Wed Sep 25 2013 Richard Shaw - 1.14.3-1 +- Update to latest upstream release. +- This package now provides tqsllib. + * Sun Aug 04 2013 Fedora Release Engineering - 1.13-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild