[X2Go-Commits] [pinentry-x2go] 01/03: Drop libcap check from configure.ac. This fork of pinentry does not contain code that builds against libcap anymore.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pinentry-x2go.

commit bdc5a1e125543eff5de066eec80a3757e0b1de3d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Aug 23 17:15:08 2014 +0200

    Drop libcap check from configure.ac. This fork of pinentry does not contain code that builds against libcap anymore.
    
      * debian/control:
          + Drop B-D: libcap-dev.
      * pinentry-x2go.spec:
          + Drop from BR: libcap-devel.
---
 configure.ac       |   13 -------------
 debian/changelog   |    5 +++++
 debian/control     |    2 +-
 pinentry-x2go.spec |    2 +-
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7b5253f..0165398 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,19 +125,6 @@ dnl Checks for libsecmem.
 GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF)
 GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
 
-dnl Check for libcap
-AC_ARG_WITH([libcap], AC_HELP_STRING([--without-libcap],
-            [Disable support for capabilities library]))
-
-if test "x$with_libcap" != "xno"; then
-  AC_PATH_PROG(SETCAP, setcap, :, "$PATH:/sbin:/usr/sbin")
-  AC_CHECK_LIB(cap, cap_set_proc, [
-    AC_DEFINE(USE_CAPABILITIES,1,[The capabilities support library is installed])
-    LIBCAP=-lcap
-  ])
-fi
-AC_SUBST(LIBCAP)
-
 dnl
 dnl Check for curses pinentry program.
 dnl
diff --git a/debian/changelog b/debian/changelog
index f3d616e..55bb04a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ pinentry-x2go (0.7.5.7-0x2go3) UNRELEASED; urgency=low
       have translators for.
     - Drop pinentry-x2go_<lang>.qm binary files from source
       tree.
+    - Drop libcap check from configure.ac. This fork of pinentry
+      does not contain code that builds against libcap anymore.
+  * debian/control:
+    + Drop B-D: libcap-dev.
   * debian/source/format:
     + Add file, use format 1.0.
   * debian/rules:
@@ -18,6 +22,7 @@ pinentry-x2go (0.7.5.7-0x2go3) UNRELEASED; urgency=low
     + Remove more buildcruft.
   * pinentry-x2go.spec:
     + Add spec file for building RPM packages. Inspired by OpenSuSE spec file.
+    + Drop from BR: libcap-devel.
 
   [ Orion Poplawski ]
   * New upstream version (0.7.5.7):
diff --git a/debian/control b/debian/control
index 803d206..acbcfdd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: X2Go Developers <x2go-dev at lists.berlios.de>
 Uploaders:
  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>,
  Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libqt4-gui, libcap-dev, libglib2.0-dev (>= 2.15.5), m4, qt4-qmake, libqt4-dev, dh-autoreconf
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libqt4-gui, libglib2.0-dev (>= 2.15.5), m4, qt4-qmake, libqt4-dev, dh-autoreconf
 Standards-Version: 3.9.3
 Homepage: http://code.x2go.org/releases/source/pinentry-x2go
 Vcs-Git: git://code.x2go.org/pinentry-x2go.git
diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec
index c034b80..c5212dc 100644
--- a/pinentry-x2go.spec
+++ b/pinentry-x2go.spec
@@ -15,7 +15,7 @@ BuildRequires:  autoconf >= 2.57, automake >= 1.7.6
 %if 0%{!?fe19} || 0%{!?fe20}
 BuildRequires:  gcc-c++
 %endif
-BuildRequires:  libcap-devel, ncurses-devel
+BuildRequires:  ncurses-devel
 %if 0%{?el5} || 0%{?el6}
 BuildRequires:  qt4-devel
 %else

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git