[gnome-ostree] 3.6: Import libpwquality for gnome-control-center

[Colin Walters <walters src gnome org>]

commit be0717a2e8e7588a931eeff23b20ae30a7fec857
Author: Colin Walters <walters verbum org>
Date:   Fri May 25 18:58:40 2012 -0400

    3.6: Import libpwquality for gnome-control-center

 gnomeos-3.6.json                           |    6 +++
 patches/libpwquality-builddir.patch        |   27 ++++++++++++++++
 patches/libpwquality-python-bindings.patch |   47 ++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 0 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 4c3469b..78481b6 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -723,6 +723,12 @@
 
 		{"src": "gnome:clutter-gtk"},
 
+		{"src": "cgwalters:libpwquality-git",
+                 "config-opts": ["--disable-python-bindings"],
+                 "patches": ["libpwquality-builddir.patch",
+                             "libpwquality-python-bindings.patch"]
+                }, 
+
 		{"src": "gnome:gnome-control-center",
 		 "config-opts": ["--disable-cups"]},
 
diff --git a/patches/libpwquality-builddir.patch b/patches/libpwquality-builddir.patch
new file mode 100644
index 0000000..bca7641
--- /dev/null
+++ b/patches/libpwquality-builddir.patch
@@ -0,0 +1,27 @@
+From 41c374d6201782a5245ac20d31fff5a61779a122 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 25 May 2012 18:20:45 -0400
+Subject: [PATCH] build: Note we don't build when srcdir != builddir
+
+---
+ configure.in |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 4c92632..e43e16a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -6,6 +6,10 @@ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CANONICAL_HOST
+ 
++dnl We don't build with srcdir != builddir at present; the Python
++dnl bindings fail
++echo \#buildapi-variable-no-builddir > /dev/null
++
+ dnl LT Version numbers, remember to change them *before* a release.
+ dnl   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
+ dnl   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
+-- 
+1.7.7.6
+
diff --git a/patches/libpwquality-python-bindings.patch b/patches/libpwquality-python-bindings.patch
new file mode 100644
index 0000000..aea0d54
--- /dev/null
+++ b/patches/libpwquality-python-bindings.patch
@@ -0,0 +1,47 @@
+From e353685e146b790ca6e83e39fb9bc46118cbbc3a Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 25 May 2012 18:27:58 -0400
+Subject: [PATCH] build: Add --disable-python-bindings option
+
+---
+ Makefile.am  |    5 ++++-
+ configure.in |    7 +++++++
+ 2 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 40aed1c..9a334f6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,10 @@
+ 
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
+ 
+-SUBDIRS = po src python doc
++SUBDIRS = po src doc
++if BUILD_PYTHON_BINDINGS
++SUBDIRS += python
++endif
+ 
+ CLEANFILES = *~
+ 
+diff --git a/configure.in b/configure.in
+index e43e16a..2f00a33 100644
+--- a/configure.in
++++ b/configure.in
+@@ -93,6 +93,13 @@ AC_ARG_WITH(sconfigdir,
+ 	SCONFIGDIR=$enableval, SCONFIGDIR=$sysconfdir/security)
+ AC_SUBST(SCONFIGDIR)
+ 
++AC_ARG_ENABLE([python-bindings],
++              AC_HELP_STRING([--enable-python-bindings],
++                             [enable Python bindings (default: yes)]),
++              [enable_python_bindings=$enableval],
++              enable_python_bindings=yes)
++AM_CONDITIONAL(BUILD_PYTHON_BINDINGS, test x"$enable_python_bindings" = xyes)
++
+ AC_ARG_WITH(python-rev,
+             [  --with-pythonrev=2.7    version of python for which modules should be built],
+             PYTHONREV=$withval,[
+-- 
+1.7.7.6
+