SPECS: unionfs.spec - complaint with template-kernel-module. - bui...

pluto pluto at pld-linux.org
Thu Jul 28 22:08:47 CEST 2005


Author: pluto                        Date: Thu Jul 28 20:08:47 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- complaint with template-kernel-module.
- build utils in %%build.
- kernel modules renamed to kernel-{,smp-}fs-unionfs.
- release 1.

---- Files affected:
SPECS:
   unionfs.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.4 SPECS/unionfs.spec:1.5
--- SPECS/unionfs.spec:1.4	Thu Jul 28 11:25:22 2005
+++ SPECS/unionfs.spec	Thu Jul 28 22:08:41 2005
@@ -2,24 +2,30 @@
 #
 # Conditional build:
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	userspace	# don't build userspace utilities
+%bcond_without	userspace	# don't build userspace programs
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
-#
+
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+
 Summary:	A Stackable Unification File System
 Summary(pl):	Stakowalny, unifikujący system plików
 Name:		unionfs
 Version:	1.0.13
-%define         _rel    0.1
+%define         _rel    1
 Release:        %{_rel}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-%{version}.tar.gz
 # Source0-md5:	1dca48ff260dacf890b8040a3cea55b3
 URL:		http://www.filesystems.org/project-unionfs.html
+%if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.153
+BuildRequires:	rpmbuild(macros) >= 1.217
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,34 +47,38 @@
 odczytu i zapisu, a także wstawianie i usuwanie gałęzi w dowolnym
 miejscu.
 
-%package -n kernel-unionfs
+%package -n kernel-fs-unionfs
 Summary:	Linux driver for unionfs
 Summary(pl):	Sterownik Linuksa dla unionfs
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
-Provides:	kernel-unionfs = %{version}-%{_rel}@%{_kernel_ver_str}
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
 
-%description -n kernel-unionfs
+%description -n kernel-fs-unionfs
 Linux driver for unionfs.
 
-%description -n kernel-unionfs -l pl
+%description -n kernel-fs-unionfs -l pl
 Sterownik Linuksa dla unionfs.
 
-%package -n kernel-smp-unionfs
+%package -n kernel-smp-fs-unionfs
 Summary:	Linux SMP driver for unionfs
 Summary(pl):	Sterownik Linuksa SMP dla unionfs
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
 Provides:	kernel-unionfs = %{version}-%{_rel}@%{_kernel_ver_str}
 
-%description -n kernel-smp-unionfs
+%description -n kernel-smp-fs-unionfs
 Linux SMP driver unionfs.
 
-%description -n kernel-smp-unionfs -l pl
+%description -n kernel-smp-fs-unionfs -l pl
 Sterownik Linuksa SMP dla unionfs.
 
 %prep
@@ -97,6 +107,11 @@
 done
 %endif
 
+%if %{with userspace}
+%{__make} utils \
+	UNIONFS_OPT_CFLAG="%{rpmcflags}"
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -112,23 +127,23 @@
 
 %if %{with userspace}
 %{__make} install-utils \
-	PREFIX=$RPM_BUILD_ROOT/usr \
+	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
 	MANDIR=$RPM_BUILD_ROOT%{_mandir}
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel-unionfs
+%post -n kernel-fs-unionfs
 %depmod %{_kernel_ver}
 
-%postun -n kernel-unionfs
+%postun -n kernel-fs-unionfs
 %depmod %{_kernel_ver}
 
-%post -n kernel-smp-unionfs
+%post -n kernel-smp-fs-unionfs
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-unionfs
+%postun -n kernel-smp-fs-unionfs
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -140,12 +155,12 @@
 %endif
 
 %if %{with kernel}
-%files -n kernel-unionfs
+%files -n kernel-fs-unionfs
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/fs/*.ko*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-unionfs
+%files -n kernel-smp-fs-unionfs
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/kernel/fs/*.ko*
 %endif
@@ -157,6 +172,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/07/28 20:08:41  pluto
+- complaint with template-kernel-module.
+- build utils in %%build.
+- kernel modules renamed to kernel-{,smp-}fs-unionfs.
+- release 1.
+
 Revision 1.4  2005/07/28 09:25:22  blekot
 - up to 1.0.13
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/unionfs.spec?r1=1.4&r2=1.5&f=u




More information about the pld-cvs-commit mailing list