packages: grub2/grub2.spec - macros cleanup

[glen]

Author: glen                         Date: Thu Nov 12 09:48:38 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- macros cleanup

---- Files affected:
packages/grub2:
   grub2.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.56 packages/grub2/grub2.spec:1.57
--- packages/grub2/grub2.spec:1.56	Thu Nov 12 08:55:45 2009
+++ packages/grub2/grub2.spec	Thu Nov 12 10:48:33 2009
@@ -56,9 +56,7 @@
 %define		_sbindir	/sbin
 %define		_bindir		%{_sbindir}
 %define		_libdir		/boot
-%define		_datadir	%{_libdir}/grub
-%define		_legcdir	%{_libdir}/grub
-%define		_confdir	/etc/grub.d/
+%define		_libexecdir	%{_libdir}/grub
 
 %description
 GRUB is a GPLed bootloader intended to unify bootloading across x86
@@ -135,21 +133,23 @@
 %endif
 	grub_emu_LDFLAGS="-s -static -lncurses -ltinfo" \
 %endif
-	pkgdatadir="%{_datadir}"
+	pkgdatadir=%{_libexecdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/sysconfig
 
 %{__make} install \
-	pkgdatadir=%{_datadir} \
+	pkgdatadir=%{_libexecdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -a docs/grub.cfg $RPM_BUILD_ROOT%{_datadir}
+cp -a docs/grub.cfg $RPM_BUILD_ROOT%{_libexecdir}
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/update-grub
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8/update-grub.8
 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/grub
 rm $RPM_BUILD_ROOT%{_infodir}/dir
+# deprecated. we don't need it
+rm $RPM_BUILD_ROOT%{_libexecdir}/update-grub_lib
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -191,22 +191,22 @@
 %attr(755,root,root) %{_sbindir}/grub-emu
 %{_mandir}/man8/grub-emu.8*
 %endif
-%config(noreplace) %verify(not md5 mtime size) %dir %{_datadir}/grub.cfg
-%dir %{_datadir}
+%config(noreplace) %verify(not md5 mtime size) %dir %{_libexecdir}/grub.cfg
+%dir %{_libexecdir}
 %ifarch %{ix86} %{x8664}
-%{_datadir}/i386-pc
+%{_libexecdir}/i386-pc
 %endif
 %ifarch ppc ppc64
-%{_datadir}/powerpc-*
+%{_libexecdir}/powerpc-*
 %endif
-%attr(755,root,root) %{_legcdir}/*_lib
+%attr(755,root,root) %{_libexecdir}/*_lib
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/grub
-%dir %{_confdir}
-%attr(755,root,root) %{_confdir}/00_header
-%attr(755,root,root) %{_confdir}/10_linux
-%attr(755,root,root) %{_confdir}/30_os-prober
-%attr(755,root,root) %{_confdir}/40_custom
-%doc %{_confdir}/README
+%dir %{_sysconfdir}/grub.d
+%doc %{_sysconfdir}/grub.d/README
+%attr(755,root,root) %{_sysconfdir}/grub.d/00_header
+%attr(755,root,root) %{_sysconfdir}/grub.d/10_linux
+%attr(755,root,root) %{_sysconfdir}/grub.d/30_os-prober
+%attr(755,root,root) %{_sysconfdir}/grub.d/40_custom
 %ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{_sbindir}/grub-mkdevicemap
 %attr(755,root,root) %{_sbindir}/grub-probe
@@ -223,6 +223,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2009/11/12 09:48:33  glen
+- macros cleanup
+
 Revision 1.56  2009/11/12 07:55:45  glen
 - add grub-garbage.patch from fedora
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.56&r2=1.57&f=u