add patches from Alex Burmashev

This commit is contained in:
Sergey Zhemoitel 2013-06-27 12:08:24 +04:00
parent 3caca86648
commit 645e6d86a7
3 changed files with 36 additions and 11 deletions

View file

@ -0,0 +1,10 @@
--- cryptkeeper-0.9.5/src/lsof.cpp.old 2012-01-26 10:42:27.213210838 +0000
+++ cryptkeeper-0.9.5/src/lsof.cpp 2012-01-26 10:43:24.051316892 +0000
@@ -21,6 +21,7 @@
#include <vector>
#include <assert.h>
#include <cstring>
+#include <unistd.h>
#include "lsof.h"
fsuser::fsuser(const char *pid, const char *name)

View file

@ -0,0 +1,11 @@
--- cryptkeeper-0.9.5/configure.ac.old 2010-07-25 13:03:02.000000000 +0100
+++ cryptkeeper-0.9.5/configure.ac 2010-07-25 13:03:12.000000000 +0100
@@ -22,7 +22,7 @@ PKG_CHECK_MODULES(DEP, gtk+-2.0 >= 2.8 g
CFLAGS="$CFLAGS $DEP_CFLAGS $GNOME_KEYRING_CFLAGS"
CXXFLAGS="$CFLAGS"
-LIBS="$DEP_LIBS $GNOME_KEYRING_LIBS"
+LIBS="$DEP_LIBS $GNOME_KEYRING_LIBS -lX11"
#AC_PROG_LIBTOOL

View file

@ -2,19 +2,21 @@
%define version 0.9.5
%define release %mkrel 1
Name: %{name}
Version: %{version}
Release: %{release}
Summary: System tray applet that manages EncFS encrypted folders
License: GPLv3
Group: System/Kernel and hardware
URL: http://tom.noflag.org.uk/cryptkeeper.html
Source0: http://tom.noflag.org.uk/cryptkeeper/%name-%version.tar.gz
BuildRequires: gtk+2-devel >= 2.8
BuildRequires: libGConf2-devel >= 2.0
Name: %{name}
Version: %{version}
Release: %{release}
Summary: System tray applet that manages EncFS encrypted folders
License: GPLv3
Group: System/Kernel and hardware
URL: http://tom.noflag.org.uk/cryptkeeper.html
Source0: http://tom.noflag.org.uk/cryptkeeper/%name-%version.tar.gz
BuildRequires: gtk+2-devel >= 2.8
BuildRequires: libGConf2-devel >= 2.0
BuildRequires: lsof
BuildRequires: encfs
#BuildRequires: encfs
Requires: encfs
Patch0: cryptkeeper-0.9.5-add-unistd-header.patch
Patch1: cryptkeeper-0.9.5-fix-linking.patch
BuildRoot: %{_tmppath}/%{name}-%{version}
%description
@ -22,6 +24,8 @@ Cryptkeeper is a Linux system tray applet that manages EncFS encrypted folders.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure2_5x