notting pushed to gwenhywfar (el6). "Merge master changes for latest upstream."

[notifications at fedoraproject.org]

>From 3f3fd490f34e38677e421bf1c5e7c22720a0b1be Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at splat.cc>
Date: Tue, 24 Mar 2015 22:14:43 -0400
Subject: Merge master changes for latest upstream.


diff --git a/.gitignore b/.gitignore
index fda97ae..afadd08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/gwenhywfar-4.3.3.tar.gz
-/gwenhywfar-4.9.0beta.tar.gz
+/gwenhywfar-4.13.1.tar.gz
diff --git a/gwen-oldgnutls.patch b/gwen-oldgnutls.patch
index 712151c..2b49b55 100644
--- a/gwen-oldgnutls.patch
+++ b/gwen-oldgnutls.patch
@@ -5,7 +5,7 @@ diff -up gwenhywfar-4.9.0beta/src/sio/syncio_tls.c.foo gwenhywfar-4.9.0beta/src/
    case GNUTLS_CIPHER_CAMELLIA_256_CBC:
    case GNUTLS_CIPHER_RC2_40_CBC:
    case GNUTLS_CIPHER_DES_CBC:
--  case GNUTLS_CIPHER_AES_192_CBC:
+-  case GNUTLS_CIPHER_AES_192_CBC: // new in gnutls-2.9.8, so i.e. not available in gnutls-2.8.x
    default:
      break;
    }
diff --git a/gwenhywfar.spec b/gwenhywfar.spec
index 27b05a7..04e7da4 100644
--- a/gwenhywfar.spec
+++ b/gwenhywfar.spec
@@ -1,10 +1,10 @@
 
-%define ver %{version}beta
+%define ver %{version}
 
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
-Version: 4.9.0
-Release: 0.2.beta%{?dist}
+Version: 4.13.1
+Release: 1%{?dist}
 # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php
 Source: %{name}-%{ver}.tar.gz
 Group: System Environment/Libraries
@@ -101,6 +101,8 @@ find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
 %{_bindir}/*
 %{_includedir}/gwenhywfar4
 %{_libdir}/*.so
+%{_libdir}/cmake/gwengui-qt4-*/
+%{_libdir}/cmake/gwenhywfar-*/
 %{_libdir}/pkgconfig/*
 %{_datadir}/aclocal/gwenhywfar.m4
 %{_datadir}/%{name}/typemaker*
@@ -115,6 +117,9 @@ find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
 %{_libdir}/libgwengui-cpp.so.*
 
 %changelog
+* Mon Mar 23 2015 Robert Scheck <robert at fedoraproject.org> - 4.13.1-1
+- update to latest upstream
+
 * Wed Jan 15 2014 Bill Nottingham <notting at redhat.com> - 4.9.0-0.2.beta
 - update to latest upstream
 
diff --git a/sources b/sources
index 6d88bf2..3d6968c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-939d2edcb7ff1727fb237ff80e54baa0  gwenhywfar-4.9.0beta.tar.gz
+231b4af546c791a85d0f042773e6bd82  gwenhywfar-4.13.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gwenhywfar.git/commit/?h=el6&id=3f3fd490f34e38677e421bf1c5e7c22720a0b1be

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390