[jhbuild] 3.20: Move libpwquality to -sysdeps

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 011657ec7def15e50f109e891d7f6b96619ba142
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Nov 3 16:06:58 2015 +0000

    3.20: Move libpwquality to -sysdeps

 modulesets/gnome-suites-core-deps-3.20.modules |   18 ------------------
 modulesets/gnome-sysdeps-3.20.modules          |   12 +++++-------
 2 files changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 2117162..5aa77fd 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -42,8 +42,6 @@
     href="http://icon-theme.freedesktop.org/releases/"/>
 <repository type="tarball" name="nice.freedesktop.org"
     href="http://nice.freedesktop.org/releases/"/>
-<repository type="tarball" name="libpwquality"
-    href="https://fedorahosted.org/releases/l/i/libpwquality/"/>
 <repository type="tarball" name="ftp.mozilla.org"
       href="http://ftp.mozilla.org/"/>
 <repository type="tarball" name="kernel.org"
@@ -1435,22 +1433,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libpwquality">
-    <if condition-unset="linux">
-      <!-- uses PAM features not in XSSO spec -->
-      <autogenargs value="--disable-pam"/>
-    </if>
-    <branch repo="libpwquality"
-            module="https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-1.2.3.tar.bz2"; 
version="1.2.3"
-            hash="sha256:b11c79ce7b03cdf878fccb653e67bd430155cc6fd224efbbb3e78842f752516a"
-            size="367794">
-      <patch file="libpwquality.libintl-link.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="cracklib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="ibus"
              autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui 
GSETTINGS_SCHEMA_CONVERT=/usr/bin/false --with-python=python3">
     <branch repo="github-tar"
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index 14ad005..626dfdf 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -74,13 +74,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="cracklib">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="c_include" name="crack.h"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="cups">
     <branch repo="system" version="1.4"/>
     <systemdependencies>
@@ -648,6 +641,11 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libpwquality">
+    <pkg-config>pwquality.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libraw">
     <pkg-config>libraw.pc</pkg-config>
     <branch repo="system"/>