- update gdb tarball

[packages/crash.git] / crash.spec

diff --git a/crash.spec b/crash.spec
index efc0cc6d45a09e49de11a6ee5d84e067d714ab71..13d064a8df2352ccd6bfd3a8d015a03bf9d12dca 100644 (file)
--- a/crash.spec
+++ b/crash.spec
@@ -15,50 +15,39 @@
 exit 1
 %endif
 
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine      with_userspace
-%global                _build_kernels          %{alt_kernel}
-%else
-%global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
-%endif
-
 %if %{without userspace}
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 %endif
 
-%define                kbrs    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo "BuildRequires:kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2" ; done)
-%define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
-%define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
 %define                rel             1
 %define                pname           crash
 Summary:       Core Analysis Suite
 Summary(pl.UTF-8):     Zestaw narzędzi do analizy zrzutów pamięci
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       7.0.8
+Version:       8.0.4
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2+
 Group:         Libraries
-Source0:       http://people.redhat.com/anderson/%{pname}-%{version}.tar.gz
-# Source0-md5: 94f3c60bc04c8e9c620878d77f23dc7f
-# git clone https://code.google.com/p/eppic
+Source0:       https://github.com/crash-utility/crash/archive/%{version}/%{pname}-%{version}.tar.gz
+# Source0-md5: 5d8513ded5c9517e713a75e712d72e3a
+# git clone -b v5.0 https://github.com/lucchouina/eppic
 Source1:       eppic.tar.xz
-# Source1-md5: a9f80ad71de9d6f5b77534a7ebdbed8e
-URL:           http://people.redhat.com/anderson/
-BuildRequires: rpmbuild(macros) >= 1.678
-%{?with_kernel:%{expand:%kbrs}}
+# Source1-md5: a04143f6eb0d72c33cd53329dc1b4803
+Source2:       https://ftp.gnu.org/gnu/gdb/gdb-10.2.tar.xz
+# Source2-md5: c044b7146903ec51c9d2337a29aee93b
+Patch0:                %{pname}-x32.patch
+Patch1:                only-patch-gdb.patch
+URL:           https://github.com/crash-utility/crash
+BuildRequires: rpmbuild(macros) >= 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 %if %{with userspace}
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
 BuildRequires: xz-devel
 BuildRequires: zlib-devel
 %endif
-ExclusiveArch: %{ix86} %{x8664} alpha arm ia64 ppc64 s390 s390x
+ExclusiveArch: %{ix86} %{x8664} x32 alpha arm ia64 ppc64 s390 s390x
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -124,19 +113,26 @@ Ten pakiet zawiera sterownik pamięci /dev/crash do sesji crash na\
 %install_kernel_modules -D installed -m memory_driver/crash -d kernel/drivers/char\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
-%setup -q -a1 -n %{pname}-%{version}
+%setup -q -a1 -a2 -n %{pname}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %{__mv} eppic extensions
 
 %build
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %if %{with userspace}
 export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
-%{__make} -j1 all extensions \
+%{__make} \
+       ARCH="%{_target_cpu}" \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
+
+%{__make} -j1 extensions \
        ARCH="%{_target_cpu}" \
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
@@ -176,7 +172,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/crash/extensions/echo.so
 %attr(755,root,root) %{_libdir}/crash/extensions/eppic.so
 %attr(755,root,root) %{_libdir}/crash/extensions/snap.so
-%attr(755,root,root) %{_libdir}/crash/extensions/trace.so
 %{_mandir}/man8/crash.8*
 
 %files devel