From 3c6b4717e329d25827e6678cf47df739a336e6ebed83ef321ff9ebfc4bfc37cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= <jsuchome@suse.com>
Date: Wed, 31 Aug 2011 13:32:14 +0000
Subject: [PATCH] 2,7d1 < Wed Aug 31 14:33:50 CEST 2011 - jsuchome@suse.cz < <
 - fix build for older distributions < - 2.21.16 < <
 -------------------------------------------------------------------

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=118
---
 yast2-installation-2.21.15.tar.bz2 |  3 ---
 yast2-installation-2.21.16.tar.bz2 |  3 +++
 yast2-installation.changes         |  6 ++++++
 yast2-installation.spec            | 25 ++++++++++++++-----------
 4 files changed, 23 insertions(+), 14 deletions(-)
 delete mode 100644 yast2-installation-2.21.15.tar.bz2
 create mode 100644 yast2-installation-2.21.16.tar.bz2

diff --git a/yast2-installation-2.21.15.tar.bz2 b/yast2-installation-2.21.15.tar.bz2
deleted file mode 100644
index ea2290a..0000000
--- a/yast2-installation-2.21.15.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4865352059715257916f7e926c66112ecb3942bf210ddced0dbb7411567a9459
-size 284539
diff --git a/yast2-installation-2.21.16.tar.bz2 b/yast2-installation-2.21.16.tar.bz2
new file mode 100644
index 0000000..6facf46
--- /dev/null
+++ b/yast2-installation-2.21.16.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1424ae44bdbda4f7e6b9e5e025929a45184381b12f723c613b0ce0ec1d046c5e
+size 301161
diff --git a/yast2-installation.changes b/yast2-installation.changes
index 8cee2ed..4dab771 100644
--- a/yast2-installation.changes
+++ b/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 31 14:33:50 CEST 2011 - jsuchome@suse.cz
+
+- fix build for older distributions
+- 2.21.16 
+
 -------------------------------------------------------------------
 Mon Aug 29 12:12:55 CEST 2011 - jsuchome@suse.cz
 
diff --git a/yast2-installation.spec b/yast2-installation.spec
index 54d4aa5..91e6069 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -1,16 +1,15 @@
 #
-# spec file for package yast2-installation (Version 2.21.15)
+# spec file for package yast2-installation (Version 2.21.16)
 #
 # norootforbuild
 
-
 Name:		yast2-installation
-Version:	2.21.15
+Version:	2.21.16
 Release:	0
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-Source0:	yast2-installation-2.21.15.tar.bz2
+Source0:	yast2-installation-2.21.16.tar.bz2
 
 prefix:		/usr
 
@@ -22,6 +21,7 @@ Source2:	YaST2-Firstboot.service
 
 %if 0%{?suse_version} >= 1210
 BuildRequires: systemd-devel
+%{systemd_requires}
 %endif
 
 BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
@@ -113,7 +113,6 @@ Recommends:	yast2-update
 Recommends:	yast2-add-on
 
 PreReq:		%fillup_prereq
-%{?systemd_requires}
 
 BuildArchitectures: noarch
 
@@ -134,7 +133,7 @@ System installation code as present on installation media.
 System installation code as present on installation media.
 
 %prep
-%setup -n yast2-installation-2.21.15
+%setup -n yast2-installation-2.21.16
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -162,9 +161,9 @@ for f in `find %{buildroot}%{_datadir}/autoinstall/modules -name "*.desktop"`; d
     %suse_update_desktop_file $f
 done 
 
-mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system/
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/lib/systemd/system/
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
@@ -172,6 +171,8 @@ rm -rf "$RPM_BUILD_ROOT"
 %post
 %{fillup_only -ns security checksig}
 
+%if 0%{suse_version} > 1140
+
 %service_add YaST2-Second-Stage.service YaST2-Firstboot.service
 
 /bin/systemctl enable YaST2-Second-Stage.service > /dev/null 2>&1 || :
@@ -186,6 +187,8 @@ fi
 %postun
 %service_del_postun YaST2-Second-Stage.service YaST2-Firstboot.service
 
+%endif #suse_version
+
 %files
 %defattr(-,root,root)
 %dir /usr/share/YaST2/control
@@ -195,8 +198,8 @@ fi
 /usr/share/YaST2/control/*.rnc
 
 # systemd service files
-%_unitdir/YaST2-Second-Stage.service
-%_unitdir/YaST2-Firstboot.service
+/lib/systemd/system/YaST2-Second-Stage.service
+/lib/systemd/system/YaST2-Firstboot.service
 
 /usr/share/YaST2/clients/*.ycp
 /usr/share/YaST2/modules/*.ycp