Author: blino
Date: Tue Feb 6 17:52:52 2007
New Revision: 116878
Added:
packages/cooker/draklive-install/current/SOURCES/draklive-install-0.2.tar.bz2
(contents, props changed)
Removed:
packages/cooker/draklive-install/current/SOURCES/draklive-install-0.1.tar.bz2
Modified:
packages/cooker/draklive-install/current/SPECS/draklive-install.spec
Log:
- 0.2
- fix progress bar (#27889)
- use fs::partitioning and fs::partitioning_wizard instead of copying installer
code
- allow to run draklive-install at live boot with "install" parameter on the
kernel command line (using xsetup.d)
Added:
packages/cooker/draklive-install/current/SOURCES/draklive-install-0.2.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/draklive-install/current/SPECS/draklive-install.spec
==============================================================================
--- packages/cooker/draklive-install/current/SPECS/draklive-install.spec
(original)
+++ packages/cooker/draklive-install/current/SPECS/draklive-install.spec
Tue Feb 6 17:52:52 2007
@@ -1,9 +1,9 @@
-# MAKE THE CHANGES IN SVN: NO PATCH OR SOURCE ALLOWED
%define name draklive-install
-%define version 0.1
-%define release %mkrel 10
+%define version 0.2
+%define release %mkrel 1
%define iconname MandrivaOne-install-icon.png
%define imgname MandrivaOne-install.png
+%define xsetup_level 60
Summary: Live installer
Name: %{name}
@@ -23,26 +23,17 @@
%setup -q
%build
-%make -C po
+%make
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %buildroot
-%makeinstall -C po
+%makeinstall
for d in %_datadir/nautilus/default-desktop
%_datadir/apps/kdesktop/DesktopLinks; do
install -D -m 0644 %name.desktop %buildroot/$d/%name.desktop
done
-install -D -m 0755 %name %buildroot/%_datadir/%name/%name
-install -m 0644 install_interactive.pm %buildroot/%_datadir/%name
-
-install -d -m 0755 %buildroot/%_sbindir
-cat > %buildroot/%_sbindir/%name <<EOF
-#!/bin/sh
-cd %_datadir/%name
-./%name
-EOF
-chmod 0755 %buildroot/%_sbindir/%name
+install -D -m 0755 %name %buildroot/%_sbindir/%name
mkdir -p
%buildroot{%_miconsdir,%_iconsdir,%_liconsdir,%_menudir,%_datadir/libDrakX/pixmaps/,%_datadir/applications}
install theme/IC-installone-48.png %buildroot%_liconsdir/%iconname
@@ -50,6 +41,7 @@
install theme/IC-installone-16.png %buildroot%_miconsdir/%iconname
install theme/IM-INSTALLCDONE.png %buildroot%_datadir/libDrakX/pixmaps/%imgname
install mandriva-draklive-install.desktop %buildroot%_datadir/applications/
+install -D -m 0755 %{name}.xsetup
%buildroot%_sysconfdir/X11/xsetup.d/%{xsetup_level}%{name}.xsetup
%find_lang %name
@@ -60,12 +52,11 @@
%clean_menus
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %buildroot
%files -f %name.lang
%defattr(-,root,root)
%_sbindir/%name
-%_datadir/%name
%_datadir/apps/kdesktop/DesktopLinks/*.desktop
%_datadir/nautilus/default-desktop/*.desktop
%_datadir/applications/mandriva-draklive-install.desktop
@@ -73,3 +64,4 @@
%_liconsdir/%iconname
%_miconsdir/%iconname
%_datadir/libDrakX/pixmaps/%imgname
+%_sysconfdir/X11/xsetup.d/??%{name}.xsetup
