- update configs for 1.17.3 (but not spec since build problems)

[packages/busybox.git] / busybox.spec

diff --git a/busybox.spec b/busybox.spec
index 19a4ca98d2793b448a2f48eab5539875ca627a29..405d41652a53c8949a88e762d92033d29879630d 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -34,16 +34,15 @@ Summary(pl.UTF-8):  Zestaw narzędzi uniksowych dla systemów wbudowanych
 Summary(pt_BR.UTF-8):  BusyBox é um conjunto de utilitários UNIX em um único binário
 Name:          busybox
 # stable line only
-Version:       1.14.2
+Version:       1.16.2
 Release:       1
 License:       GPL
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: c13b09b4125688d5fca5c95a79bf814a
+# Source0-md5: 2ba980f720a5bdce4ec05423519acc35
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}
-Patch100:      http://busybox.net/downloads/fixes-1.14.2/busybox-1.14.2-ls.patch
 Patch1:                %{name}-logconsole.patch
 Patch2:                %{name}-printf-gettext.patch
 Patch3:                %{name}-loadfont.patch
@@ -139,8 +138,8 @@ Statycznie skonsolidowany busybox.
 %package initrd
 Summary:       Static busybox for initrd
 Summary(pl.UTF-8):     Statycznie skonsolidowany busybox dla initrd
-Group:         Applications
-Conflicts:     geninitrd < 10000.10
+Group:         Base
+Conflicts:     geninitrd < 10000.20
 
 %description initrd
 Static busybox for initrd.
@@ -150,7 +149,6 @@ Statycznie skonsolidowany busybox dla initrd.
 
 %prep
 %setup -q
-%patch100 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -236,7 +234,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/busybox}
 %{?with_static:install built/busybox.static $RPM_BUILD_ROOT%{_bindir}}
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd
-install built/busybox.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/initrd-busybox
+install built/busybox.initrd $RPM_BUILD_ROOT%{_libdir}/initrd/busybox
 %endif
 
 install busybox.links $RPM_BUILD_ROOT%{_libdir}/busybox
@@ -279,5 +277,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/initrd/initrd-busybox
+%attr(755,root,root) %{_libdir}/initrd/busybox
 %endif