Author: glen Date: Sun May 18 16:22:22 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- only userspace tools here, kernel module is in kernel spec
---- Files affected:
SPECS:
unionfs.spec (1.33 -> 1.34)
---- Diffs:
================================================================
Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.33 SPECS/unionfs.spec:1.34
--- SPECS/unionfs.spec:1.33 Sun May 18 18:01:26 2008
+++ SPECS/unionfs.spec Sun May 18 18:22:17 2008
@@ -1,52 +1,20 @@
# $Revision$, $Date$
-# TODO
-# - patch for vserver vfs_unlink
-#
-# Conditional build:
-%bcond_without kernel # don't build kernel modules
-%bcond_without userspace # don't build userspace programs
-%bcond_without dist_kernel # without distribution kernel
-%bcond_with verbose # verbose build (V=1)
-%bcond_without vserver # build with vserver patches
-
-%ifarch sparc
-%undefine with_smp
-%endif
-
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine with_userspace
-%endif
-%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 pname unionfs
-Summary: A Stackable Unification File System
+Summary: Unionfs control tools
Summary(pl.UTF-8): Stakowalny, unifikujący system plików
-Name: %{pname}%{_alt_kernel}
-Version: 1.3
-Release: %{?snap:0.%(echo %{snap} | tr - _).}%{rel}
+Name: unionfs
+Version: 0.2.1
+Release: 1
+Epoch: 1
License: GPL v2
Group: Base/Kernel
-#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: %{pname}-build.patch
-#Patch1: %{pname}-vserver.patch
+Source0:
ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-utils-0.x/%{name}_utils-%{version}.tar.gz
+# Source0-md5: c88ba424a7eb196ac930ee41ef3b6f43
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: rpmbuild(macros) >= 1.330
-%endif
BuildRequires: libuuid-devel
-BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
+# NB: tools do not require -libs
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define _bindir %{_sbindir}
%description
Unionfs is a stackable unification file system, which can appear to
@@ -67,75 +35,78 @@
odczytu i zapisu, a także wstawianie i usuwanie gałęzi w dowolnym
miejscu.
-%package -n kernel%{_alt_kernel}-fs-unionfs
-Summary: Linux driver for unionfs
-Summary(pl.UTF-8): Sterownik Linuksa dla unionfs
-Release: [EMAIL PROTECTED]
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun): %releq_kernel_up
-%endif
+%package libs
+Summary: Shared unionfs utils library
+Group: Libraries
+
+%description libs
+This package contains shared library used to control a unionfs mount.
+
+%package devel
+Summary: Header files for unionfs library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki unionfs
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+
+%description devel
+Header files for unionfs library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki unionfs.
+
+%package static
+Summary: Static unionfs library
+Summary(pl.UTF-8): Statyczna biblioteka unionfs
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
-%description -n kernel%{_alt_kernel}-fs-unionfs
-Linux driver for unionfs.
+%description static
+Static unionfs library.
-%description -n kernel%{_alt_kernel}-fs-unionfs -l pl.UTF-8
-Sterownik Linuksa dla unionfs.
+%description static -l pl.UTF-8
+Statyczna biblioteka unionfs.
%prep
-%setup -q -n %{pname}-%{!?snap:%{version}}%{?snap:%{snap}}
-%patch0 -p1
-#%{?with_vserver:%patch1 -p1}
+%setup -q -n %{name}_utils-%{version}
%build
-%if %{with kernel}
-%build_kernel_modules -m unionfs \
- EXTRACFLAGS="-DUNIONFS_NDEBUG -DUNIONFS_XATTR"
-%endif
-
-%if %{with userspace}
-%{__make} utils \
- CC="%{__cc}" \
- UNIONFS_OPT_CFLAG="%{rpmcflags} %{rpmldflags}"
-%endif
+%configure
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-
-%if %{with kernel}
-%install_kernel_modules -m unionfs -d kernel/fs
-%endif
-
-%if %{with userspace}
-%{__make} install-utils \
- PREFIX=$RPM_BUILD_ROOT%{_prefix} \
- MANDIR=$RPM_BUILD_ROOT%{_mandir}
-%endif
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n kernel%{_alt_kernel}-fs-unionfs
-%depmod %{_kernel_ver}
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
-%postun -n kernel%{_alt_kernel}-fs-unionfs
-%depmod %{_kernel_ver}
-
-%if %{with userspace}
%files
%defattr(644,root,root,755)
%doc AUTHORS NEWS INSTALL README
-%attr(755,root,root) %{_sbindir}/*
-%{_mandir}/man?/*
-%endif
+%attr(755,root,root) %{_bindir}/unionctl
+%attr(755,root,root) %{_bindir}/uniondbg
+%attr(755,root,root) %{_bindir}/unionimap
+%{_mandir}/man8/*
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-fs-unionfs
+%files libs
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/fs/*.ko*
-%endif
+%attr(755,root,root) %{_libdir}/libunionfs_utils.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libunionfs_utils.so.0
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/unionfs_utils.h
+%{_libdir}/libunionfs_utils.la
+%{_libdir}/libunionfs_utils.so
+%{_mandir}/man3/*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libunionfs_utils.a
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -143,6 +114,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.34 2008-05-18 16:22:17 glen
+- only userspace tools here, kernel module is in kernel spec
+
Revision 1.33 2008-05-18 16:01:26 glen
- drop up/smp, alt kernel fixes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/unionfs.spec?r1=1.33&r2=1.34&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
