[pwsafe] Apply patch from BZ667541
Ralf Ertzinger
ertzing at fedoraproject.org
Wed Sep 7 09:49:37 UTC 2011
commit 12ba88c080f8ff292f95afc33651e9105e2cc1f2
Author: Ralf Ertzinger <ralf at skytale.net>
Date: Wed Sep 7 11:49:12 2011 +0200
Apply patch from BZ667541
pwsafe-0.2.0-paste-gnome-terminal.patch | 20 ++++++++++++++++++++
pwsafe.spec | 8 +++++++-
2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/pwsafe-0.2.0-paste-gnome-terminal.patch b/pwsafe-0.2.0-paste-gnome-terminal.patch
new file mode 100644
index 0000000..6758a57
--- /dev/null
+++ b/pwsafe-0.2.0-paste-gnome-terminal.patch
@@ -0,0 +1,20 @@
+Index: pwsafe.cpp
+===================================================================
+RCS file: /cvsroot/pwsafe/pwsafe/pwsafe.cpp,v
+retrieving revision 1.57
+diff -u -r1.57 pwsafe.cpp
+--- pwsafe.cpp 12 Aug 2007 12:33:06 -0000 1.57
++++ pwsafe.cpp 5 Jan 2011 22:16:43 -0000
+@@ -1820,10 +1820,10 @@
+ if (xev.xselectionrequest.target == XA_TARGETS(xdisplay)) {
+ // tell them what we can supply
+ const Atom targets[] = { XA_TARGETS(xdisplay), XA_TIMESTAMP(xdisplay), XA_TEXT(xdisplay), XA_STRING };
+- XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_TARGETS(xdisplay), 32, PropModeReplace, reinterpret_cast<const unsigned char*>(&targets), sizeof(targets)/sizeof(targets[0]));
++ XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_ATOM, 32, PropModeReplace, reinterpret_cast<const unsigned char*>(&targets), sizeof(targets)/sizeof(targets[0]));
+ }
+ else if (xev.xselectionrequest.target == XA_TIMESTAMP(xdisplay)) {
+- XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_TIMESTAMP(xdisplay), 32, PropModeReplace, reinterpret_cast<const unsigned char*>(×tamp), 1);
++ XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_INTEGER, 32, PropModeReplace, reinterpret_cast<const unsigned char*>(×tamp), 1);
+ }
+ else if (xev.xselectionrequest.target == XA_TEXT(xdisplay) ||
+ xev.xselectionrequest.target == XA_STRING) {
diff --git a/pwsafe.spec b/pwsafe.spec
index 2e5edd7..01f9037 100644
--- a/pwsafe.spec
+++ b/pwsafe.spec
@@ -1,6 +1,6 @@
Name: pwsafe
Version: 0.2.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A unix commandline program that manages encrypted password databases
Group: Applications/Databases
@@ -9,6 +9,8 @@ URL: http://nsd.dyndns.org/pwsafe/
Source0: http://nsd.dyndns.org/pwsafe/releases/pwsafe-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: pwsafe-0.2.0-paste-gnome-terminal.patch
+
BuildRequires: readline-devel, ncurses-devel, openssl-devel
BuildRequires: libXt-devel, libXext-devel, libXau-devel, libXdmcp-devel
BuildRequires: libSM-devel, libICE-devel, libXmu-devel
@@ -19,6 +21,7 @@ Compatible with CounterPane's PasswordSafe Win32 program versions 2.x and 1.x.
%prep
%setup -q
+%patch0 -p0 -b .paste-gnome-terminal
%build
@@ -48,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 07 2011 Ralf Ertzinger <ralf at skytale.net> - 0.2.0-11
+- Apply patch from BZ667541
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list