SPECS: shfs.spec - drop grsec_kernel bcond

glen glen at pld-linux.org
Sun May 18 17:17:03 CEST 2008


Author: glen                         Date: Sun May 18 15:17:03 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop grsec_kernel bcond

---- Files affected:
SPECS:
   shfs.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: SPECS/shfs.spec
diff -u SPECS/shfs.spec:1.72 SPECS/shfs.spec:1.73
--- SPECS/shfs.spec:1.72	Sun Mar  9 03:39:01 2008
+++ SPECS/shfs.spec	Sun May 18 17:16:58 2008
@@ -5,22 +5,24 @@
 %bcond_without	kernel		# don't build kernel modules
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_without	userspace	# don't build userspace tools
-%bcond_with	grsec_kernel	# build for kernel-grsecurity
-#
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
-#
+
 %ifarch sparc
 %undefine	with_smp
 %endif
-#
-%define		_rel	20
+
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine	with_userspace
+%endif
+
+%define		rel	20
 Summary:	(Secure) SHell FileSystem utilities
 Summary(pl.UTF-8):	Narzędzia obsługujące system plików przez ssh
 Name:		shfs
 Version:	0.35
-Release:	%{_rel}
+Release:	%{rel}
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/shfs/%{name}-%{version}.tar.gz
@@ -64,7 +66,7 @@
 %package -n kernel%{_alt_kernel}-fs-shfs
 Summary:	SHell File System Linux kernel module
 Summary(pl.UTF-8):	Moduł jądra Linuksa obsługujący powłokowy system plików
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
@@ -160,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2008-05-18 15:16:58  glen
+- drop grsec_kernel bcond
+
 Revision 1.72  2008-03-09 02:39:01  zbyniu
 - patch for kmem_cache_t -> struct kmem_cache (prefered since 2.6.20, required by .24)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/shfs.spec?r1=1.72&r2=1.73&f=u



More information about the pld-cvs-commit mailing list