From 134b1babbfb4695f31939d8f477663d04696935bf52b28a7a5252a59c67eb104 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 15 Aug 2014 11:49:20 +0000 Subject: [PATCH] Accepting request 244810 from home:mlin7442:branches:GNOME:Factory do not hard requires cracklib-dict-full, fix conflict issue in installation-images-openSUSE with cryptsetup OBS-URL: https://build.opensuse.org/request/show/244810 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libpwquality?expand=0&rev=10 --- libpwquality.changes | 7 +++++++ libpwquality.spec | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libpwquality.changes b/libpwquality.changes index 6e2c87f..76f31ce 100644 --- a/libpwquality.changes +++ b/libpwquality.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 15 11:26:45 UTC 2014 - mlin@suse.com + +- Don't hard requires cracklib-dict-full, use Recommends for -dict-full + and Requires cracklib-dict to avoid conflict issue in + installation-images-openSUSE with cryptsetup + ------------------------------------------------------------------- Thu Sep 12 18:42:45 UTC 2013 - dimstar@opensuse.org diff --git a/libpwquality.spec b/libpwquality.spec index 5e66ed8..7f383ca 100644 --- a/libpwquality.spec +++ b/libpwquality.spec @@ -1,7 +1,7 @@ # # spec file for package libpwquality # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,8 +43,9 @@ of random passwords that pass the checks. %package -n libpwquality1 Summary: Library for password quality checking and generating random passwords Group: System/Libraries -Requires: cracklib-dict-full >= 2.8 +Requires: cracklib-dict >= 2.8 Recommends: %{name}-lang +Recommends: cracklib-dict-full >= 2.8 # To make lang package installable Provides: %{name}