SPECS: anyfs-tools.spec - cleanup, userspace bcond

[qboosh]

Author: qboosh                       Date: Wed Apr  4 13:04:53 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup, userspace bcond

---- Files affected:
SPECS:
   anyfs-tools.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/anyfs-tools.spec
diff -u SPECS/anyfs-tools.spec:1.20 SPECS/anyfs-tools.spec:1.21
--- SPECS/anyfs-tools.spec:1.20	Mon Apr  2 05:34:34 2007
+++ SPECS/anyfs-tools.spec	Wed Apr  4 15:04:48 2007
@@ -4,9 +4,12 @@
 # - fix make anyfs_module
 # - make subpackage for libany.a ( -libany or just -static)
 
+#
+# Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build 'any' kernel module
-
+%bcond_without	userspace	# don't build userspace utilities
+#
 Summary:	anyfs-tools - a unix-like toolset for recovering and converting filesystems
 Summary(pl.UTF-8):	anyfs-tools - uniksowy zestaw narzędzi do odzyskiwania i konwersji systemów plików
 Name:		anyfs-tools
@@ -105,9 +108,21 @@
 tabeli i-węzłów przy odmontowywaniu systemu plików, bez zmiany danych
 na urządzeniu blokowym.
 
+%package devel
+Summary:	Header files for anyfs-tools
+Summary(pl.UTF-8):	Pliki nagłówkowe anyfs-tools
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+Header files for anyfs-tools.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe anyfs-tools.
+
 %package -n kernel%{_alt_kernel}-misc-any
-Summary:        AnyFS kernel module
-Summary(pl.UTF-8):      Modul AnyFS
+Summary:        AnyFS Linux kernel module
+Summary(pl.UTF-8):      Moduł jądra Linuksa AnyFS
 Release:        %{_rel}@%{_kernel_ver_str}
 License:        GPL v2
 Group:          Base/Kernel
@@ -121,33 +136,29 @@
 %endif
 
 %description -n kernel%{_alt_kernel}-misc-any
-This package contains the AnyFS kernel module.
-
-%package devel
-Summary:	Header files for anyfs-tools
-Summary(pl.UTF-8):	Pliki nagłówkowe anyfs-tools
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description devel
-Header files for anyfs-tools.
+This package contains the AnyFS Linux kernel module.
 
-%description devel -l pl.UTF-8
-Pliki nagłówkowe anyfs-tools.
+%description -n kernel%{_alt_kernel}-misc-any -l pl.UTF-8
+Ten pakiet zawiera moduł jądra Linuksa AnyFS.
 
 %prep
 %setup -q
 %patch0 -p0
 %patch1 -p0
+
+%if %{with kernel}
 cat > anyfs/Makefile <<'EOF'
 obj-m += any.o
 any-objs := inode.o file.o dir.o namei.o symlink.o
 EOF
+%endif
 
 %build
+%if %{with userspace}
 %configure
 %{__make} libany
 %{__make} progs
+%endif
 
 %if %{with kernel}
 %build_kernel_modules -C anyfs -m any
@@ -156,8 +167,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with userspace}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
+%endif
 
 %if %{with kernel}
 %install_kernel_modules -m anyfs/any -d kernel/fs -n any -s current
@@ -174,6 +187,7 @@
 %postun -n kernel%{_alt_kernel}-misc-any
 %depmod %{_kernel_ver}
 
+%if %{with userspace}
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README THANKS
@@ -184,10 +198,14 @@
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 %lang(ru) %{_mandir}/ru/man3/*
-%lang(ru) %{_mandir}/ru/man3/*
 %lang(ru) %{_mandir}/ru/man5/*
 %lang(ru) %{_mandir}/ru/man8/*
 
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/anyfs-tools
+%endif
+
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-misc-any
 %defattr(644,root,root,755)
@@ -195,16 +213,15 @@
 /lib/modules/%{_kernel_ver}/kernel/fs/any-current.ko*
 %endif
 
-%files devel
-%defattr(644,root,root,755)
-%{_includedir}/anyfs-tools
-
 %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.21  2007/04/04 13:04:48  qboosh
+- cleanup, userspace bcond
+
 Revision 1.20  2007/04/02 03:34:34  shadzik
 - add %post and %postun for kernel module subpackage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/anyfs-tools.spec?r1=1.20&r2=1.21&f=u