Author: pixel
Date: Tue Jan 30 15:06:47 2007
New Revision: 115492
Modified:
packages/cooker/drakxtools/current/SPECS/drakxtools.spec
Log:
- tarball of drakxtools now contains a perl-install/ directory
(so that tools/ directory is cleanly kept outside)
- harddrake now requires meta-task for rpmsrate-raw
Modified: packages/cooker/drakxtools/current/SPECS/drakxtools.spec
==============================================================================
--- packages/cooker/drakxtools/current/SPECS/drakxtools.spec (original)
+++ packages/cooker/drakxtools/current/SPECS/drakxtools.spec Tue Jan 30
15:06:47 2007
@@ -75,6 +75,7 @@
Requires(pre): rpm-helper
Requires(post): rpm-helper
Requires: printerdrake-common
+Requires: meta-task
%package -n harddrake-ui
Summary: Main Hardware Configuration/Information Tool
@@ -187,12 +188,12 @@
%setup -q
%build
-%make CFLAGS="$RPM_OPT_FLAGS"
+%make -C perl-install CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
-%make PREFIX=$RPM_BUILD_ROOT install
+%make -C perl-install PREFIX=$RPM_BUILD_ROOT install
mkdir -p
$RPM_BUILD_ROOT/{%_initrddir,%_sysconfdir/{X11/xinit.d,X11/wmsession.d,sysconfig/harddrake2}}
touch $RPM_BUILD_ROOT/etc/sysconfig/harddrake2/previous_hw
@@ -257,7 +258,7 @@
# temporary fix until we reenable this feature
rm -f $RPM_BUILD_ROOT%_sysconfdir/X11/xinit.d/harddrake2
-perl -I . -mharddrake::data -e 'print "DETECT_$_->{class}=yes\n" foreach
@harddrake::data::tree' |sort >
$RPM_BUILD_ROOT%_sysconfdir/sysconfig/harddrake2/service.conf
+perl -I perl-install -mharddrake::data -e 'print "DETECT_$_->{class}=yes\n"
foreach @harddrake::data::tree' |sort >
$RPM_BUILD_ROOT%_sysconfdir/sysconfig/harddrake2/service.conf
%find_lang libDrakX
%find_lang libDrakX-standalone
@@ -317,7 +318,7 @@
%defattr(-,root,root)
%{_datadir}/applications/mandriva-drakxtools-curses-system.desktop
%{_datadir}/applications/mandriva-drakxtools-curses-user.desktop
-%doc diskdrake/diskdrake.html
+%doc perl-install/diskdrake/diskdrake.html
%_iconsdir/localedrake.png
%_iconsdir/large/localedrake.png
%_iconsdir/mini/localedrake.png
