From 25dcbde513b40e79ca4bad50272d7cb0639ff72d35ca346ec7caccdc813e2500 Mon Sep 17 00:00:00 2001
From: Thomas Fehr <null@suse.de>
Date: Tue, 14 Aug 2012 17:14:28 +0000
Subject: [PATCH] - 2.22.3 - rename dm maps according to crypttab during update
 (bnc#774247)

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-update?expand=0&rev=29
---
 yast2-update-2.22.2.tar.bz2 |  3 ---
 yast2-update-2.22.3.tar.bz2 |  3 +++
 yast2-update.changes        |  6 ++++++
 yast2-update.spec           | 26 +++++++++++++++-----------
 4 files changed, 24 insertions(+), 14 deletions(-)
 delete mode 100644 yast2-update-2.22.2.tar.bz2
 create mode 100644 yast2-update-2.22.3.tar.bz2

diff --git a/yast2-update-2.22.2.tar.bz2 b/yast2-update-2.22.2.tar.bz2
deleted file mode 100644
index 81341ea..0000000
--- a/yast2-update-2.22.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bac12a167ee7dd2e24635c9fa9024f09ab1feb43e6c3a9fd7bbfd525cae4736f
-size 118802
diff --git a/yast2-update-2.22.3.tar.bz2 b/yast2-update-2.22.3.tar.bz2
new file mode 100644
index 0000000..c56264a
--- /dev/null
+++ b/yast2-update-2.22.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f25ed29021cd48dd873139a145728f26cde3d513f77adb0724b1932535e48ee5
+size 115455
diff --git a/yast2-update.changes b/yast2-update.changes
index 338deaf..cb7d631 100644
--- a/yast2-update.changes
+++ b/yast2-update.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 13 16:02:08 CEST 2012 - fehr@suse.de
+
+- 2.22.3
+- rename dm maps according to crypttab during update (bnc#774247)
+
 -------------------------------------------------------------------
 Wed Jan 25 13:50:34 CET 2012 - jsuchome@suse.cz
 
diff --git a/yast2-update.spec b/yast2-update.spec
index 5eff4a2..5f709b2 100644
--- a/yast2-update.spec
+++ b/yast2-update.spec
@@ -16,19 +16,19 @@
 #
 
 
-
 Name:           yast2-update
-Version:        2.22.2
+Version:        2.22.3
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        yast2-update-%{version}.tar.bz2
 
-Group:          System/YaST
-License:        GPL-2.0
-BuildRequires:  perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
-# FileSystems::possible_root_fs
-BuildRequires:  yast2-storage >= 2.19.12
+BuildRequires:  perl-XML-Writer
+BuildRequires:  update-desktop-files
+BuildRequires:  yast2-devtools
+BuildRequires:  yast2-testsuite
+# Stroage::ChangeDmNamesFromCrypttab
+BuildRequires:  yast2-storage >= 2.22.9
 # Packages::GetBaseSourceID
 BuildRequires:  yast2-packager >= 2.17.19
 # Wizard::OpenOKDialog
@@ -41,8 +41,8 @@ BuildRequires:  libxml2
 # control.rng
 BuildRequires:  yast2-installation >= 2.17.44
 
-# FileSystems::possible_root_fs
-Requires:       yast2-storage >= 2.19.12
+# Stroage::ChangeDmNamesFromCrypttab
+Requires:       yast2-storage >= 2.22.9
 # PackagesUI::RunPackageSelector
 Requires:       yast2 >= 2.17.40
 Requires:       yast2-installation
@@ -63,17 +63,20 @@ Conflicts:      yast2-pkg-bindings < 2.15.11
 Conflicts:      yast2-storage < 2.15.4
 
 Summary:        YaST2 - Update
+License:        GPL-2.0
+Group:          System/YaST
 
 %package FACTORY
-Group:          System/YaST
 PreReq:         %fillup_prereq
-Requires:       yast2-update yast2
+Requires:       yast2
+Requires:       yast2-update
 
 # moved into yast2-update from yast2-installation
 # to remove dependency on yast2-storage
 Provides:       yast2-update:/usr/share/YaST2/clients/update.ycp
 
 Summary:        YaST2 - Update
+Group:          System/YaST
 
 %description
 Use this component if you wish to update your system.
@@ -92,6 +95,7 @@ autoreconf --force --install
 export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 
+%{?suse_update_config:%{suse_update_config -f}}
 ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
 # V=1: verbose build in case we used AM_SILENT_RULES(yes)
 # so that RPM_OPT_FLAGS check works