- 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 f3be2ec7f9f1770d5df27119489fb875a6b21a52..405d41652a53c8949a88e762d92033d29879630d 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -34,12 +34,12 @@ 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.13.3
+Version:       1.16.2
 Release:       1
 License:       GPL
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 0cde6d2790e790837d6d7e82faae3ca1
+# Source0-md5: 2ba980f720a5bdce4ec05423519acc35
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}
@@ -138,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.3
+Group:         Base
+Conflicts:     geninitrd < 10000.20
 
 %description initrd
 Static busybox for initrd.
@@ -169,7 +169,7 @@ install %{SOURCE2} .config
        LDFLAGS="%{ld_rpmldflags} -static" \
 %if %{with dietlibc}
        LIBRARIES="-lrpc" \
-       CC="diet gcc"
+       CC="diet %{__cc}"
 %else
 %if %{with glibc}
        %{CrossOpts} \
@@ -201,7 +201,7 @@ install %{SOURCE1} .config
        LDFLAGS="%{ld_rpmldflags} -static" \
 %if %{with dietlibc}
        LIBRARIES="-lrpc" \
-       CC="diet gcc"
+       CC="diet %{__cc}"
 %else
 %if %{with glibc}
        %{CrossOpts} \
@@ -229,7 +229,7 @@ mv -f busybox built/busybox.static
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_initrd_bindir},%{_bindir},%{_mandir}/man1,%{_libdir}/busybox}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/busybox}
 
 %{?with_static:install built/busybox.static $RPM_BUILD_ROOT%{_bindir}}
 %if %{with initrd}