- ready.

Changed files:
    cvsfs.spec -> 1.9

diff --git a/cvsfs.spec b/cvsfs.spec
index 96babfd86e319d9f236864d1f103f697388edc34..d4921cd6850bed67f9d530f5e99fcae0cec885a5 100644 (file)
--- a/cvsfs.spec
+++ b/cvsfs.spec
@@ -1,74 +1,105 @@
-%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                smpstr          %{?_with_smp:-smp}
-%define                smp             %{?_with_smp:1}%{!?_with_smp:0}
-
 Summary:       CVSFS
 Summary(pl):   CVSFS
 Name:          cvsfs
-Version:       1.0.4
-Release:       1
+Version:       1.0.9
+%define                _rel 1
+Release:       %{_rel}
 License:       GPL
 Group:         Networking/Daemons
-Source0:       http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.zip
-Patch0:                %{name}-config.patch
+Source0:       %{name}-%{version}.tar.gz
+%{!?_without_dist_kernel:BuildRequires: kernel-headers}
+#BuildRequires:        autoconf
+#BuildRequires:        automake
+
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc
+#%define               _sysconfdir     /etc
 
 %description
-CVS fs.
 
-%package -n kernel%{smpstr}-cvsfs
+%description -l pl
+
+%package -n kernel-cvsfs
 Summary:       CVSFS kernel module
 Summary(pl):   Modu³ j±dra CVSFS
-Release:       %{release}@%{_kernel_ver_str}
+Release:       %{_rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
-PreReq:                /sbin/depmod
+Prereq:                /sbin/depmod
+%{!?_without_dist_kernel:%requires_releq_kernel_up}
 
-%description -n kernel%{smpstr}-cvsfs
-CVS fs kernel module.
+%description -n kernel-cvsfs
 
-%description -n kernel%{smpstr}-cvsfs -l pl
-Modu³ j±dra CVS fs.
+%description -n kernel-cvsfs -l pl
+
+%package -n kernel-smp-cvsfs
+Summary:       CVSFS kernel module
+Summary(pl):   Modu³ j±dra CVSFS
+Release:       %{_rel}@%{_kernel_ver_str}
+Group:         Base/Kernel
+Prereq:                /sbin/depmod
+%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+
+%description -n kernel-smp-cvsfs
+
+%description -n kernel-smp-cvsfs -l pl
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
-%{__make} \
-%if %{smp}
-       CFLAGS+=" -D__KERNEL_SMP=1"
-%endif
+%configure2_13 
+
+CXXFLAGS="-DMODULES -D__SMP__ -D__KERNEL_SMP=1" %{__make}
+
+mv cvsfs/cvsfs.o cvsfs/cvsfs-smp.o
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}} \
-       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/fs
+install -d \
+       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/fs \
+       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/fs \
+       $RPM_BUILD_ROOT%{_sbindir}
+
+install cvsmnt/cvsmnt $RPM_BUILD_ROOT%{_sbindir}
+install cvsmount/cvsmount $RPM_BUILD_ROOT%{_sbindir}
+install cvsumount/cvsumount $RPM_BUILD_ROOT%{_sbindir}
 
-install cvsmnt/cvsmnt $RPM_BUILD_ROOT%{_bindir}
-install cvsmount/cvsmount $RPM_BUILD_ROOT%{_bindir}
-install cvsmount/mount.cvsfs $RPM_BUILD_ROOT%{_bindir}
-install cvsumount/cvsmount $RPM_BUILD_ROOT%{_bindir}
 install cvsfs/cvsfs.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/fs
-gzip -9nf ChangeLog README INSTALL
+install cvsfs/cvsfs-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/fs/cvsfs.o
+
+#gzip -9nf README* tcpdump.patch CHANGES
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel%{smpstr}-cvsfs
+%post
+
+%postun
+
+%post -n kernel-cvsfs
 /sbin/depmod -a
 
-%postun -n kernel%{smpstr}-cvsfs
+%postun -n kernel-cvsfs
+/sbin/depmod -a
+
+%post -n kernel-smp-cvsfs
+/sbin/depmod -a
+
+%postun -n kernel-smp-cvsfs
 /sbin/depmod -a
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog.gz README.gz
-%attr(755,root,root) %{_bindir}/*
+%doc ChangeLog README
+%attr(755,root,root) %{_sbindir}/*
+
+%files -n kernel-cvsfs
+%defattr(644,root,root,755)
+%attr(600,root,root) /lib/modules/%{_kernel_ver}/fs/cvsfs.o
 
-%files -n kernel%{smpstr}-cvsfs
+%files -n kernel-smp-cvsfs
 %defattr(644,root,root,755)
-%attr(600,root,root) /lib/modules/*/fs/cvsfs.o
+%attr(600,root,root) /lib/modules/%{_kernel_ver}smp/fs/cvsfs.o