SPECS: shfs.spec - patch against kernels >=2.6.19 - bconds up, smp...
zbyniu
zbyniu at pld-linux.org
Thu Mar 29 00:58:01 CEST 2007
Author: zbyniu Date: Wed Mar 28 22:58:01 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- patch against kernels >=2.6.19
- bconds up, smp removed, package smp removed
---- Files affected:
SPECS:
shfs.spec (1.69 -> 1.70)
---- Diffs:
================================================================
Index: SPECS/shfs.spec
diff -u SPECS/shfs.spec:1.69 SPECS/shfs.spec:1.70
--- SPECS/shfs.spec:1.69 Tue Feb 27 12:20:31 2007
+++ SPECS/shfs.spec Thu Mar 29 00:57:55 2007
@@ -3,8 +3,6 @@
# Conditional build:
%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
-%bcond_without up # don't build UP module
-%bcond_without smp # don't build SMP module
%bcond_with verbose # verbose build (V=1)
%bcond_without userspace # don't build userspace tools
%bcond_with grsec_kernel # build for kernel-grsecurity
@@ -17,7 +15,7 @@
%undefine with_smp
%endif
#
-%define _rel 19
+%define _rel 20
Summary: (Secure) SHell FileSystem utilities
Summary(pl.UTF-8): Narzędzia obsługujące system plików przez ssh
Name: shfs
@@ -35,10 +33,11 @@
Patch5: %{name}-inode_oops.patch
Patch6: %{name}-d_entry.patch
Patch7: %{name}-shfs_get_sb.patch
+Patch8: %{name}-2.6.19.patch
URL: http://shfs.sourceforge.net/
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.330
+BuildRequires: rpmbuild(macros) >= 1.379
%endif
%{?with_dist_kernel:Requires: kernel(shfs)}
Obsoletes: shfsmount
@@ -68,8 +67,8 @@
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun): %releq_kernel_up
+%requires_releq_kernel
+Requires(postun): %releq_kernel
%endif
Provides: kernel(shfs)
%if "%{_alt_kernel}" == "%{nil}"
@@ -82,27 +81,6 @@
%description -n kernel%{_alt_kernel}-fs-shfs -l pl.UTF-8
Moduł jądra Linuksa obsługujący powłokowy system plików.
-%package -n kernel%{_alt_kernel}-smp-fs-shfs
-Summary: SHell File System Linux SMP kernel module
-Summary(pl.UTF-8): Moduł jądra Linuksa SMP obsługujący powłokowy system plików
-Release: %{_rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun): %releq_kernel_smp
-%endif
-Provides: kernel(shfs)
-%if "%{_alt_kernel}" == "%{nil}"
-Obsoletes: kernel-smp-misc-shfs
-%endif
-
-%description -n kernel%{_alt_kernel}-fs-shfs
-SHell File System Linux kernel module.
-
-%description -n kernel%{_alt_kernel}-smp-fs-shfs -l pl.UTF-8
-Moduł jądra Linuksa obsługujący powłokowy system plików.
-
%prep
%setup -q
%patch0 -p1
@@ -113,6 +91,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
cat > shfs/Linux-2.6/Makefile <<'EOF'
obj-m := shfs.o
@@ -156,12 +135,6 @@
%postun -n kernel%{_alt_kernel}-fs-shfs
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-fs-shfs
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-fs-shfs
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
@@ -173,27 +146,22 @@
%endif
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-fs-shfs
%defattr(644,root,root,755)
%dir /lib/modules/%{_kernel_ver}/kernel/fs/shfs
/lib/modules/%{_kernel_ver}/kernel/fs/shfs/shfs.ko*
%endif
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-fs-shfs
-%defattr(644,root,root,755)
-%dir /lib/modules/%{_kernel_ver}smp/kernel/fs/shfs
-/lib/modules/%{_kernel_ver}smp/kernel/fs/shfs/shfs.ko*
-%endif
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.70 2007/03/28 22:57:55 zbyniu
+- patch against kernels >=2.6.19
+- bconds up, smp removed, package smp removed
+
Revision 1.69 2007/02/27 11:20:31 sparky
- without up bcond
- fixed %files for smp-only
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/shfs.spec?r1=1.69&r2=1.70&f=u
More information about the pld-cvs-commit
mailing list