[yast-commit] r65474 - in /trunk/installation: VERSION package/yast2-installation.changes yast2-installation.spec.in
Author: jsuchome Date: Wed Aug 31 15:31:27 2011 New Revision: 65474 URL: http://svn.opensuse.org/viewcvs/yast?rev=65474&view=rev Log: - fix build for older distributions - 2.21.16 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/yast2-installation.spec.in Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=65474&r1=65473&r2=65474&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Aug 31 15:31:27 2011 @@ -1 +1 @@ -2.21.15 +2.21.16 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=65474&r1=65473&r2=65474&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Aug 31 15:31:27 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +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 - added systemd .service files for second stage and firstboot Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=65474&r1=65473&r2=65474&view=diff ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Wed Aug 31 15:31:27 2011 @@ -1,6 +1,5 @@ @HEADER-COMMENT@ - @HEADER@ Group: System/YaST License: GPL v2 or later @@ -130,15 +129,17 @@ %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@ %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 || : @@ -153,6 +154,8 @@ %postun %service_del_postun YaST2-Second-Stage.service YaST2-Firstboot.service +%endif #suse_version + %files %defattr(-,root,root) %dir /usr/share/YaST2/control @@ -162,8 +165,8 @@ /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 @clientdir@/*.ycp @moduledir@/*.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
jsuchome@svn2.opensuse.org