From 36edc86826eb47786aa7af7b541322f19acac7dd Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 4 Mar 2002 22:22:46 +0000 Subject: - use new macros (ver-rel) - removed smp/up obsoletes - rel.7. Changed files: kernel-net-ip_wccp.spec -> 1.13 diff --git a/kernel-net-ip_wccp.spec b/kernel-net-ip_wccp.spec index 157e114..59d4f5d 100644 --- a/kernel-net-ip_wccp.spec +++ b/kernel-net-ip_wccp.spec @@ -2,10 +2,8 @@ # conditional build # _without_dist_kernel without distribution kernel -%define _kernel_ver %(grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2) -%define _kernel_ver_str %(echo %{_kernel_ver} | sed s/-/_/g) %define _orig_name ip_wccp -%define _rel 6 +%define _rel 7 Summary: Kernel module for WCCP protocol Summary(pl): Moduł kernela do obsługi protokołu WCCP @@ -17,7 +15,6 @@ Group: Base/Kernel Source0: http://www.squid-cache.org/WCCP-support/Linux/%{_orig_name}.c %{!?_without_dist_kernel:BuildRequires: kernel-headers} BuildRequires: %{kgcc_package} -Obsoletes: kernel-smp-net-%{_orig_name} Prereq: /sbin/depmod %{!?_without_dist_kernel:%requires_releq_kernel_up} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -34,7 +31,6 @@ Summary(pl): Modu Release: %{_rel}@%{_kernel_ver_str} %{!?_without_dist_kernel:%requires_releq_kernel_smp} Group: Base/Kernel -Obsoletes: kernel-net-%{_orig_name} Prereq: /sbin/depmod %description -n kernel-smp-net-%{_orig_name} @@ -60,10 +56,10 @@ mv -f %{_orig_name}.o %{_orig_name}smp.o %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/ipv4 -install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/ipv4 -cp %{_orig_name}.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/ipv4 -cp %{_orig_name}smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/ipv4/%{_orig_name}.o +install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc +install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc +cp %{_orig_name}.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc +cp %{_orig_name}smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_orig_name}.o %clean rm -rf $RPM_BUILD_ROOT @@ -82,8 +78,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/ipv4/* +/lib/modules/%{_kernel_ver}/misc/* %files -n kernel-smp-net-%{_orig_name} %defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}smp/ipv4/* +/lib/modules/%{_kernel_ver}smp/misc/* -- cgit v0.10.2