From af6c2e76580cb9902a5c3f1a5f0a91154d21445cac2f25fef92a36c2c5abddbc Mon Sep 17 00:00:00 2001
From: Lukas Ocilka <locilka@suse.com>
Date: Wed, 19 Oct 2011 14:42:34 +0000
Subject: [PATCH] - Creating /etc/mtab linking to /proc/self/mounts in
 umount_finish   (bnc#725166) - 2.21.25

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=152
---
 yast2-installation-2.21.24.tar.bz2 |  3 ---
 yast2-installation-2.21.25.tar.bz2 |  3 +++
 yast2-installation.changes         |  7 ++++++
 yast2-installation.spec            | 34 ++++++++++++++----------------
 4 files changed, 26 insertions(+), 21 deletions(-)
 delete mode 100644 yast2-installation-2.21.24.tar.bz2
 create mode 100644 yast2-installation-2.21.25.tar.bz2

diff --git a/yast2-installation-2.21.24.tar.bz2 b/yast2-installation-2.21.24.tar.bz2
deleted file mode 100644
index b3cac11..0000000
--- a/yast2-installation-2.21.24.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee38adc6161a51b1264df7d9a6f9da939d583006888459d9d7c1292f803fb3c2
-size 269179
diff --git a/yast2-installation-2.21.25.tar.bz2 b/yast2-installation-2.21.25.tar.bz2
new file mode 100644
index 0000000..e0a7b5b
--- /dev/null
+++ b/yast2-installation-2.21.25.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eed825f1d097a29c9d8b743e5c5bc84a8535a0ee0d3dc44957ca5e9b47d32acc
+size 307852
diff --git a/yast2-installation.changes b/yast2-installation.changes
index 4e48c8a..0ac0ec1 100644
--- a/yast2-installation.changes
+++ b/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 19 16:25:41 CEST 2011 - locilka@suse.cz
+
+- Creating /etc/mtab linking to /proc/self/mounts in umount_finish
+  (bnc#725166)
+- 2.21.25
+
 -------------------------------------------------------------------
 Fri Oct 14 11:27:58 CEST 2011 - fcrozat@suse.com
 
diff --git a/yast2-installation.spec b/yast2-installation.spec
index ca92a3e..2ecc247 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -19,13 +19,11 @@
 
 
 Name:           yast2-installation
-Version:        2.21.24
+Version:        2.21.25
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-installation-2.21.24.tar.bz2
-
-Prefix:         /usr
+Source0:        yast2-installation-%{version}.tar.bz2
 
 Group:          System/YaST
 License:        GPL-2.0+
@@ -146,26 +144,26 @@ System installation code as present on installation media.
 System installation code as present on installation media.
 
 %prep
-%setup -n yast2-installation-2.21.24
+%setup -n yast2-installation-%{version}
 
 %build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
 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}
+./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
 make %{?jobs:-j%jobs} V=1
 
 %install
 make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
     d=${f##*/}
     %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
 done
@@ -214,7 +212,7 @@ rm -rf "$RPM_BUILD_ROOT"
 /usr/share/YaST2/clients/*.ycp
 /usr/share/YaST2/modules/*.ycp
 /usr/share/YaST2/modules/*.ybc
-%{prefix}/share/applications/YaST2/*.desktop
+%{_prefix}/share/applications/YaST2/*.desktop
 /usr/share/autoinstall/modules/*.desktop
 /usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc
 %dir /usr/share/autoinstall
@@ -236,19 +234,19 @@ rm -rf "$RPM_BUILD_ROOT"
 /var/adm/fillup-templates/sysconfig.security-checksig
 
 # programs and scripts
-%{prefix}/lib/YaST2/startup
+%{_prefix}/lib/YaST2/startup
 
 # icewm
 /etc/icewm
 
-%dir %{prefix}/share/doc/packages/yast2-installation
-%{prefix}/share/doc/packages/yast2-installation/COPYING
-%readme %{prefix}/share/doc/packages/yast2-installation/README
+%dir %{_prefix}/share/doc/packages/yast2-installation
+%{_prefix}/share/doc/packages/yast2-installation/COPYING
+%readme %{_prefix}/share/doc/packages/yast2-installation/README
 
 %files devel-doc
 %defattr(-,root,root)
-%doc %{prefix}/share/doc/packages/yast2-installation
-%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
-%exclude %{prefix}/share/doc/packages/yast2-installation/README
+%doc %{_prefix}/share/doc/packages/yast2-installation
+%exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING
+%exclude %{_prefix}/share/doc/packages/yast2-installation/README
 
 %changelog