SPECS: syslinux.spec - 3.70

areq areq at pld-linux.org
Wed Jul 2 13:06:56 CEST 2008


Author: areq                         Date: Wed Jul  2 11:06:56 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 3.70

---- Files affected:
SPECS:
   syslinux.spec (1.90 -> 1.91) 

---- Diffs:

================================================================
Index: SPECS/syslinux.spec
diff -u SPECS/syslinux.spec:1.90 SPECS/syslinux.spec:1.91
--- SPECS/syslinux.spec:1.90	Mon May 12 13:06:47 2008
+++ SPECS/syslinux.spec	Wed Jul  2 13:06:50 2008
@@ -4,13 +4,12 @@
 Summary(pt_BR.UTF-8):	Carregador de boot simples
 Summary(zh_CN.UTF-8):	Linux操作系统的启动管理器
 Name:		syslinux
-Version:	3.63
+Version:	3.70
 Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2
-# Source0-md5:	ee6b84cc7b598b4e1a00a4a8c6676d4e
-Patch0:		%{name}-logical-boot.patch
+# Source0-md5:	32e900331339d7d3d4e8cfee8a5ea8c0
 URL:		http://syslinux.zytor.com/
 BuildRequires:	nasm
 BuildRequires:	perl-base
@@ -76,7 +75,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 sed -i 's/-march=i386//' sample/Makefile
 sed -i 's/FPNG_NO_WRITE_SUPPORTED/DPNG_NO_WRITE_SUPPORTED/' com32/lib/MCONFIG
@@ -88,14 +86,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_includedir}}
-install ldlinux.sys $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_includedir}}
+install core/ldlinux.sys $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %{__make} -j1 install-all \
 	INSTALLROOT=$RPM_BUILD_ROOT \
 	LIBDIR=%{_libdir} \
 	MANDIR=%{_mandir}
 
+rm -fr $RPM_BUILD_ROOT/{boot,tftpboot}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -104,13 +104,13 @@
 %doc NEWS README* doc/*.txt
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/???[.a-z]*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/???[.a-z]*
 %{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/com32
+%{_datadir}/%{name}/com32
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -118,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2008/07/02 11:06:50  areq
+- 3.70
+
 Revision 1.90  2008/05/12 11:06:47  arekm
 - fix booting from logical partitions (from upstream)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/syslinux.spec?r1=1.90&r2=1.91&f=u



More information about the pld-cvs-commit mailing list