Author: glen Date: Sun May 18 16:01:31 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- drop up/smp, alt kernel fixes
---- Files affected:
SPECS:
unionfs.spec (1.32 -> 1.33)
---- Diffs:
================================================================
Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.32 SPECS/unionfs.spec:1.33
--- SPECS/unionfs.spec:1.32 Fri Mar 16 00:28:39 2007
+++ SPECS/unionfs.spec Sun May 18 18:01:26 2008
@@ -6,47 +6,47 @@
%bcond_without kernel # don't build kernel modules
%bcond_without userspace # don't build userspace programs
%bcond_without dist_kernel # without distribution kernel
-%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 vserver # build with vserver patches
-%bcond_with grsec_kernel # build for kernel-grsecurity
-#
+
+%ifarch sparc
+%undefine with_smp
+%endif
+
%if %{without kernel}
%undefine with_dist_kernel
%endif
-#
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define alt_kernel grsecurity
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine with_userspace
%endif
-#
-%ifarch sparc
-%undefine with_smp
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define _enable_debug_packages 0
%endif
-#define _snap 20060916-2203
-%define _rel 0.1
-#
+#define snap 20060916-2203
+%define rel 0.1
+%define pname unionfs
Summary: A Stackable Unification File System
Summary(pl.UTF-8): Stakowalny, unifikujący system plików
-Name: unionfs
+Name: %{pname}%{_alt_kernel}
Version: 1.3
-Release: %{?_snap:0.%(echo %{_snap} | tr - _).}%{_rel}
+Release: %{?snap:0.%(echo %{snap} | tr - _).}%{rel}
License: GPL v2
Group: Base/Kernel
-#Source0:
ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/snapshots/%{name}-%{_snap}.tar.gz
-Source0:
ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/%{name}-%{version}.tar.gz
+#Source0:
ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/snapshots/%{pname}-%{snap}.tar.gz
+Source0:
ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/%{pname}-%{version}.tar.gz
# Source0-md5: af5106f29fb0ddb12b028f522fa0463c
-Patch0: %{name}-build.patch
-#Patch1: %{name}-vserver.patch
+Patch0: %{pname}-build.patch
+#Patch1: %{pname}-vserver.patch
URL: http://www.filesystems.org/project-unionfs.html
%if %{with kernel} && %{with dist_kernel}
BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.17
-BuildRequires: kernel%{_alt_kernel}-module-build < 3:2.6.18
+#BuildRequires: kernel%{_alt_kernel}-module-build < 3:2.6.18
BuildRequires: rpmbuild(macros) >= 1.330
%endif
BuildRequires: libuuid-devel
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
%description
Unionfs is a stackable unification file system, which can appear to
@@ -70,7 +70,7 @@
%package -n kernel%{_alt_kernel}-fs-unionfs
Summary: Linux driver for unionfs
Summary(pl.UTF-8): Sterownik Linuksa dla unionfs
-Release: [EMAIL PROTECTED]
+Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
%if %{with dist_kernel}
@@ -84,25 +84,8 @@
%description -n kernel%{_alt_kernel}-fs-unionfs -l pl.UTF-8
Sterownik Linuksa dla unionfs.
-%package -n kernel%{_alt_kernel}-smp-fs-unionfs
-Summary: Linux SMP driver for unionfs
-Summary(pl.UTF-8): Sterownik Linuksa SMP dla unionfs
-Release: [EMAIL PROTECTED]
-Group: Base/Kernel
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun): %releq_kernel_smp
-%endif
-Provides: kernel%{_alt_kernel}-unionfs = [EMAIL PROTECTED]
-
-%description -n kernel%{_alt_kernel}-smp-fs-unionfs
-Linux SMP driver unionfs.
-
-%description -n kernel%{_alt_kernel}-smp-fs-unionfs -l pl.UTF-8
-Sterownik Linuksa SMP dla unionfs.
-
%prep
-%setup -q %{?_snap:-n %{name}-%{_snap}}
+%setup -q -n %{pname}-%{!?snap:%{version}}%{?snap:%{snap}}
%patch0 -p1
#%{?with_vserver:%patch1 -p1}
@@ -140,12 +123,6 @@
%postun -n kernel%{_alt_kernel}-fs-unionfs
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-fs-unionfs
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-fs-unionfs
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
@@ -155,25 +132,20 @@
%endif
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-fs-unionfs
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/kernel/fs/*.ko*
%endif
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-fs-unionfs
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/fs/*.ko*
-%endif
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.33 2008-05-18 16:01:26 glen
+- drop up/smp, alt kernel fixes
+
Revision 1.32 2007-03-15 23:28:39 glen
- grsec_kernel bcond from AC-branch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/unionfs.spec?r1=1.32&r2=1.33&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
