Hello community,
here is the log from the commit of package lilo
checked in at Tue Jul 10 19:00:50 CEST 2007.
--------
--- arch/i386/lilo/lilo.changes 2007-04-23 11:31:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2007-07-10 13:52:38.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jul 10 13:52:08 CEST 2007 - pth@suse.de
+
+- Split off PDF documentation into it's own sub package.
+- repackage source with bzip2.
+
+-------------------------------------------------------------------
Old:
----
lilo-22.7.src.tar.gz
New:
----
lilo-22.7.src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.X19882/_old 2007-07-10 18:59:55.000000000 +0200
+++ /var/tmp/diff_new_pack.X19882/_new 2007-07-10 18:59:55.000000000 +0200
@@ -13,15 +13,15 @@
Name: lilo
BuildRequires: bin86 ghostscript-fonts-std ghostscript-library latex2html libtiff-devel nasm texlive
%ifarch x86_64
-BuildRequires: gcc-32bit glibc-devel-32bit
+BuildRequires: gcc-32bit glibc-devel-32bit libgcc42-32bit libmudflap42-32bit
%endif
-License: BSD License and BSD-like
+License: BSD 3-Clause
Group: System/Boot
Autoreqprov: on
Version: 22.7
-Release: 66
+Release: 90
Summary: The Linux Loader, a Boot Menu
-Source: ftp://brun.dyndns.org/pub/linux/lilo/lilo-%{version}.src.tar.gz
+Source: ftp://brun.dyndns.org/pub/linux/lilo/lilo-%{version}.src.tar.bz2
Patch: lilo-22.7.diff
Patch1: lilo-22.7-loop_dev.diff
Patch5: lilo-22.7-vga_inst.diff
@@ -61,6 +61,32 @@
Cort Dougan
Benjamin Herrenschmidt
+%package doc
+Group: System/Boot
+Summary: The Linux Loader, a Boot Menu
+Requires: %{name} = %{version}
+
+%description doc
+LILO boots Linux from your hard drive. It can also boot other operating
+systems, such as MS-DOS and OS/2, and can even boot DOS from the second
+hard drive. The configuration file is /etc/lilo.conf.
+
+The PowerPC variant can be used on new PowerMacs and CHRP machines.
+
+The ix86 variant comes with Memtest86, offering an image that can be
+booted to perform a memory test.
+
+
+
+Authors:
+--------
+ John Coffman
+ Werner Almesberger
+ PowerPC part:
+ Paul Mackeras
+ Cort Dougan
+ Benjamin Herrenschmidt
+
%prep
%setup -q
%patch -p1
@@ -80,14 +106,14 @@
%patch21 -p1
%build
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%define my_optflags %{optflags} -fno-strict-aliasing
%ifarch x86_64
- make CC="cc -m32" OPT="$RPM_OPT_FLAGS"
- make CC="cc -m32" activate OPT="$RPM_OPT_FLAGS"
+ make CC="gcc -m32" OPT="%my_optflags"
+ make CC="gcc -m32" activate OPT="%my_optflags"
make -C doc all
%else
- make OPT="$RPM_OPT_FLAGS"
- make activate OPT="$RPM_OPT_FLAGS"
+ make OPT="%{my_optflags}"
+ make activate OPT="%{my_optflags}"
make -C doc all
%endif
@@ -98,11 +124,11 @@
make install ROOT=$RPM_BUILD_ROOT
install -m 0755 activate $RPM_BUILD_ROOT/sbin/
rm -f doc/*.dvi
-make -C doc all
+make -C doc pdf
#make -C doc html
#rm sample/os2ins64.bmp
rm -f sample/ins64e.bmp
-rm -f $RPM_BUILD_ROOT/boot/diag1.img
+rm -f %{buildroot}/boot/diag1.img
#
%files
@@ -111,8 +137,6 @@
%doc README.common.problems README.disk README.raid1
%doc sample
%doc $RPM_SOURCE_DIR/README.SuSE
-%doc doc/tech.pdf doc/user.pdf
-#%doc doc/tech.html doc/user.html
/sbin/activate
/sbin/lilo
/sbin/mkrescue
@@ -122,7 +146,15 @@
%doc %{_mandir}/man8/mkrescue.8.gz
%doc $RPM_SOURCE_DIR/README.graphics
+%files doc
+%defattr(-,root,root)
+%doc doc/tech.pdf doc/user.pdf
+#%doc doc/tech.html doc/user.html
+
%changelog
+* Tue Jul 10 2007 - pth@suse.de
+- Split off PDF documentation into it's own sub package.
+- repackage source with bzip2.
* Mon Apr 23 2007 - pth@suse.de
- Switch te_ams to texlive.
* Wed Mar 14 2007 - pth@suse.de
++++++ lilo-22.3.4-pdf.diff ++++++
--- /var/tmp/diff_new_pack.X19882/_old 2007-07-10 18:59:55.000000000 +0200
+++ /var/tmp/diff_new_pack.X19882/_new 2007-07-10 18:59:56.000000000 +0200
@@ -7,25 +7,26 @@
RLATEX=./rlatex
FIG2DEV=fig2dev
SHELL=/bin/sh
-@@ -13,7 +15,7 @@
+@@ -13,7 +15,8 @@
.tex.dvi:
$(RLATEX) $*
-all: user.dvi tech.dvi user.ps tech.ps
+all: user.dvi tech.dvi user.pdf tech.pdf
++pdf: user.pdf tech.pdf
user.ps: user.dvi
dvips -o user.ps user.dvi
-@@ -25,6 +27,16 @@
+@@ -25,6 +28,16 @@
tech.dvi: tech.tex $(IMAGES)
-+user.pdf: user.dvi
++user.pdf: user.tex
+ $(PDFLATEX) user
+ $(THUMBPDF) user
+ $(PDFLATEX) user
+
-+tech.pdf: tech.dvi
++tech.pdf: tech.tex
+ $(PDFLATEX) tech
+ $(THUMBPDF) tech
+ $(PDFLATEX) tech
++++++ lilo-22.7-gfx.diff ++++++
--- /var/tmp/diff_new_pack.X19882/_old 2007-07-10 18:59:56.000000000 +0200
+++ /var/tmp/diff_new_pack.X19882/_new 2007-07-10 18:59:56.000000000 +0200
@@ -1,3 +1,24 @@
+--- Makefile
++++ Makefile
+@@ -330,15 +330,15 @@
+ first.s: first.S lilo.h version.h Makefile
+ $(CPP) $(PCONFIG) -DFIRST=0x199d1f05 -o first.s first.S
+
+-second.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
++second.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
+ graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile
+ $(CPP) $(PCONFIG) -DTEXT=0x8bd7820b second.S -o second.s
+
+-third.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
++third.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
+ graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile
+ $(CPP) $(PCONFIG) -DMENU=0x7920a7c2 second.S -o third.s
+
+-bitmap.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
++bitmap.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
+ graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile
+ $(CPP) $(PCONFIG) -DBITMAP=0xf54f8b9d second.S -o bitmap.s
+
--- bsect.c
+++ bsect.c
@@ -774,6 +774,7 @@
@@ -786,27 +807,6 @@
#define MAX_MENU_TITLE 37 /* maximum MENU title length */
#define NEW_HDR_SIG "HdrS" /* setup header signature */
---- Makefile
-+++ Makefile
-@@ -330,15 +330,15 @@
- first.s: first.S lilo.h version.h Makefile
- $(CPP) $(PCONFIG) -DFIRST=0x199d1f05 -o first.s first.S
-
--second.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
-+second.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
- graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile
- $(CPP) $(PCONFIG) -DTEXT=0x8bd7820b second.S -o second.s
-
--third.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
-+third.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
- graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile
- $(CPP) $(PCONFIG) -DMENU=0x7920a7c2 second.S -o third.s
-
--bitmap.s: second.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
-+bitmap.s: second.S gfxlogo.S read.S volume.S mapper.S biosdata.S shs3.S bdata.h lilo.h version.h \
- graph.S menu.S strlen.S bitmap.S crt.S display4.S Makefile
- $(CPP) $(PCONFIG) -DBITMAP=0xf54f8b9d second.S -o bitmap.s
-
--- second.S
+++ second.S
@@ -618,7 +618,8 @@
++++++ lilo-mount_by_persistent_name.diff ++++++
--- /var/tmp/diff_new_pack.X19882/_old 2007-07-10 18:59:56.000000000 +0200
+++ /var/tmp/diff_new_pack.X19882/_new 2007-07-10 18:59:56.000000000 +0200
@@ -1,12 +1,6 @@
----
- bsect.c | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-Index: lilo-22.7/bsect.c
-===================================================================
---- lilo-22.7.orig/bsect.c
+--- lilo-22.7/bsect.c
+++ lilo-22.7/bsect.c
-@@ -1058,16 +1058,19 @@ if (image) { /* long section specific to
+@@ -1058,16 +1058,19 @@
"read-write")) strcat(options,"rw ");
if ((root = cfg_get_strg(cf_kernel,"root")) || (root = cfg_get_strg(
cf_options,"root"))) {
++++++ mkrescue.diff ++++++
--- /var/tmp/diff_new_pack.X19882/_old 2007-07-10 18:59:56.000000000 +0200
+++ /var/tmp/diff_new_pack.X19882/_new 2007-07-10 18:59:56.000000000 +0200
@@ -1,7 +1,6 @@
-diff -urNp lilo-22.7.orig/mkrescue lilo-22.7/mkrescue
---- lilo-22.7.orig/mkrescue 2004-11-16 09:50:08.000000000 +0100
-+++ lilo-22.7/mkrescue 2005-10-05 16:10:03.000000000 +0200
-@@ -80,13 +80,13 @@ else
+--- lilo-22.7/mkrescue
++++ lilo-22.7/mkrescue
+@@ -80,13 +80,13 @@
config=/etc/lilo.conf
fi
@@ -19,7 +18,7 @@
loopback=loop0
looppart=loop1
install=text
-@@ -179,7 +179,11 @@ then
+@@ -179,7 +179,11 @@
fi
umount $mount 2>/dev/null
@@ -32,7 +31,7 @@
while [ $# -gt 0 ]; do
-@@ -678,7 +682,7 @@ elif [ "$fast" = fast ]; then
+@@ -678,7 +682,7 @@
fi
if [ $debug != true ]; then
++++++ QuickInst.diff ++++++
--- /var/tmp/diff_new_pack.X19882/_old 2007-07-10 18:59:56.000000000 +0200
+++ /var/tmp/diff_new_pack.X19882/_new 2007-07-10 18:59:56.000000000 +0200
@@ -1,7 +1,6 @@
-diff -urNp lilo-22.7.orig/QuickInst lilo-22.7/QuickInst
---- lilo-22.7.orig/QuickInst 2003-12-15 05:49:37.000000000 +0100
-+++ lilo-22.7/QuickInst 2005-10-05 16:11:35.000000000 +0200
-@@ -816,11 +816,15 @@ Type !cat $CFG_FILE if you want to che
+--- lilo-22.7/QuickInst
++++ lilo-22.7/QuickInst
+@@ -816,11 +816,15 @@
EOF
if yesno "Test LILO installation now ?" yes; then
echo
@@ -22,7 +21,7 @@
(
if
$SBIN_DIR/lilo -t 2>&1
-@@ -859,7 +863,7 @@ EOF
+@@ -859,7 +863,7 @@
grep '^Warning: ' <$outfile
echo
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org