SPECS: rc-boot.spec - rm "R: bootloader" - R: rc-boot-bootloader -...

[arvenil]

Author: arvenil                      Date: Sun Jan  6 23:08:06 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rm "R: bootloader"
- R: rc-boot-bootloader
- reverted add "S: rc-boot-lilo" - mistake (thanks to qbosh)
- s#/etc/sysconfig/rc-boot#%{_sysconfdir}#
- dropped Conflicts (not needed anymore)

---- Files affected:
SPECS:
   rc-boot.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/rc-boot.spec
diff -u SPECS/rc-boot.spec:1.29 SPECS/rc-boot.spec:1.30
--- SPECS/rc-boot.spec:1.29	Sat Jan  5 14:58:24 2008
+++ SPECS/rc-boot.spec	Mon Jan  7 00:08:01 2008
@@ -12,11 +12,8 @@
 # Source0-md5:	2a6e4d604d938ab7567e419c21725d88
 Source1:	PLD.image
 Patch0:		%{name}-prefer-PLD.patch
-Requires:	bootloader
+Requires:	rc-boot-bootloader
 Requires:	sed
-Suggests:	rc-boot-lilo
-Conflicts:	grub < 0.90-2
-Conflicts:	lilo < 22.0.2-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -49,7 +46,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/sbin,%{_sysconfdir}/images,%{_mandir}/man8}
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-boot/images/PLD
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/images/PLD
 
 install src/rc-boot	$RPM_BUILD_ROOT/sbin
 install doc/config	$RPM_BUILD_ROOT%{_sysconfdir}
@@ -75,7 +72,7 @@
 
 %files -n rc-boot-image-PLD
 %defattr(644,root,root,755)
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-boot/images/PLD
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/images/PLD
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -83,6 +80,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2008-01-06 23:08:01  arvenil
+- rm "R: bootloader"
+- R: rc-boot-bootloader
+- reverted add "S: rc-boot-lilo" - mistake (thanks to qbosh)
+- s#/etc/sysconfig/rc-boot#%{_sysconfdir}#
+- dropped Conflicts (not needed anymore)
+
 Revision 1.29  2008-01-05 13:58:24  arvenil
 - S: rc-boot-lilo
 - added TODO
@@ -214,4 +218,3 @@
 Revision 1.1.1.1  2001/02/07 12:54:03  dobrek
 - Initial import.
 - Some documentation in rc-boot/doc
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rc-boot.spec?r1=1.29&r2=1.30&f=u