- updated to 3.14

Changed files:
    elilo.spec -> 1.10

diff --git a/elilo.spec b/elilo.spec
index 4fc4ba475d3151746f9f9d074eddecb2f993abde..ffedd918c5813d74c4522d00fdfaf16ced99e823 100644 (file)
--- a/elilo.spec
+++ b/elilo.spec
@@ -1,12 +1,12 @@
 Summary:       ELILO: EFI Linux Boot Loader
 Summary(pl.UTF-8):     ELILO - linuksowy bootloader dla platform EFI
 Name:          elilo
-Version:       3.12
+Version:       3.14
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
-Source0:       http://downloads.sourceforge.net/elilo/%{name}-%{version}-source.tar.gz
-# Source0-md5: 6c428f351599dbd079c38a979e216c6d
+Source0:       http://downloads.sourceforge.net/elilo/%{name}-%{version}-all.tar.gz
+# Source0-md5: d16086bcb228d2c25e241d73c1bf36be
 URL:           http://elilo.sourceforge.net/
 BuildRequires: gnu-efi >= 3.0d
 ExclusiveArch: %{ix86} %{x8664} ia64
@@ -21,10 +21,12 @@ ELILO to linuksowy bootloader dla platform IA-64 (IPF), IA-32 (x86)
 oraz x86_64 opartych na EFI.
 
 %prep
-%setup -q
+%setup -q -c
+
+tar xf elilo-%{version}-source.tar.gz
 
 %build
-%{__make} -j1 \
+%{__make} -C elilo -j1 \
        ARCH=$(echo %{_target_base_arch} | sed -e 's/i386/ia32/') \
        CC="%{__cc}" \
        OPTIMFLAGS="%{rpmcflags}" \
@@ -36,15 +38,15 @@ oraz x86_64 opartych na EFI.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},/boot/efi}
 
-install tools/eliloalt $RPM_BUILD_ROOT%{_sbindir}
-install elilo.efi $RPM_BUILD_ROOT/boot/efi
+install elilo/tools/eliloalt $RPM_BUILD_ROOT%{_sbindir}
+install elilo/elilo.efi $RPM_BUILD_ROOT/boot/efi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README* TODO docs/*.txt examples
+%doc %{version}-release-notes.txt elilo/{ChangeLog,README*,TODO} elilo/docs/*.txt elilo/examples
 %attr(755,root,root) %{_sbindir}/eliloalt
 %dir /boot/efi
 /boot/efi/elilo.efi