- spec almost rewritten; todo: UP/SMP modules build process must be fixed

Changed files:
    dmsdos.spec -> 1.2

diff --git a/dmsdos.spec b/dmsdos.spec
index 9402c591d14d98cdfa4c6e21bf1123807ec4895d..bec7a24fd7ab5ba9fb65b55e45d2115049e260f4 100644 (file)
--- a/dmsdos.spec
+++ b/dmsdos.spec
@@ -2,83 +2,142 @@
 # conditional build
 # _without_dist_kernel          without distribution kernel
 
+# TODO: proper UP/SMP modules build
+
 %define                _rel 1
 
 Summary:       Support for FAT compressed volumes
+Summary(pl):   Obs³uga skompresowanych systemów plików FAT
 Name:          dmsdos
 Version:       0.9.2.2
-Release:       %{_rel}@%{_kernel_ver_str}
-License:       GPL
+Release:       %{_rel}
+License:       GPL/LGPL
 Group:         Base/Kernel
 URL:           http://cmp.felk.cvut.cz/~pisa/dmsdos/
 Source0:       http://cmp.felk.cvut.cz/~pisa/dmsdos/sources/dmsdos-0.9.2.2.tar.gz
 Source1:       dmsdos.config
 Source2:       dmsdos-config.h
+Patch0:                %{name}-opt.patch
 %{!?_without_dist_kernel:BuildRequires:         kernel-headers >= 2.2.0 }
 BuildRequires: %{kgcc_package}
-BuildRequires: grep
-BuildRequires: textutils
-PreReq:                /sbin/depmod
-PreReq:                modutils >= 2.3.18-2
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
-Requires:      dev >= 2.7.7-10
-Exclusivearch: %{ix86}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
+Support for FAT compressed volumes (Stacker, DoubleSpace, DriveSpace).
+This package contains some utilities like dmsdosfsck.
+
+%description -l pl
+Obs³uga skompresowanych systemów plików FAT (Stacker, DoubleSpace,
+DriveSpace). Ten pakiet zawiera narzêdzia typu dmsdosfsck.
+
+%package -n kernel-fs-dmsdos
+Summary:       Linux support for compressed FAT volumes
+Summary(pl):   Obs³uga skompresowanych systemów plików FAT dla Linuksa
+Release:       %{_rel}@%{_kernel_ver_str}
+License:       GPL
+Group:         Base/Kernel
+PreReq:                /sbin/depmod
+%{!?_without_dist_kernel:%requires_releq_kernel_up}
+
+%description -n kernel-fs-dmsdos
+Linux support for compressed FAT volumes (Stacker, DoubleSpace,
+DriveSpace).
 
-%package -n dmsdos-smp
-Summary:       SMP module for dmsdos
+%description -n kernel-fs-dmsdos -l pl
+Obs³uga skompresowanych systemów plików FAT (Stacker, DoubleSpace,
+DriveSpace) dla Linuksa.
+
+%package -n kernel-smp-fs-dmsdos
+Summary:       Linux SMP support for compressed FAT volumes
+Summary(pl):   Obs³uga skompresowanych systemów plików FAT dla Linuksa SMP
 Release:       %{_rel}@%{_kernel_ver_str}
+License:       GPL
 Group:         Base/Kernel
 PreReq:                /sbin/depmod
-PreReq:                modutils >= 2.3.18-2
 %{!?_without_dist_kernel:%requires_releq_kernel_smp}
-Requires:      dev >= 2.7.7-10
 
-%description -n dmsdos-smp
+%description -n kernel-smp-fs-dmsdos
+Linux SMP support for compressed FAT volumes (Stacker, DoubleSpace,
+DriveSpace).
+
+%description -n kernel-smp-fs-dmsdos -l pl
+Obs³uga skompresowanych systemów plików FAT (Stacker, DoubleSpace,
+DriveSpace) dla Linuksa SMP.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
-cp %{SOURCE1} src/.config
-cp %{SOURCE2} src/dmsdos-config.h
+cp -f %{SOURCE1} src/.config
+cp -f %{SOURCE2} src/dmsdos-config.h
 cd src
-make depend
-make clean
-make
+%{__make} depend
+%{__make} clean
+
+%{__make} LIB_SHARED=1 OPT="%{rpmcflags}" libdmsdos.so.0.9.2 \
+       dutil dmsdosd dcread dmsdosfsck mcdmsdos cvflist cvftest
+
+# SMP
+%{__make} dmsdos.o # PUT PROPER OPTIONS HERE
+mv -f dmsdos.o dmsdos-smp.o
+
+# UP
+%{__make} dmsdos.o # PUT PROPER OPTIONS HERE
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/fs
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/fs
-install NVdriver-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/NVdriver.o
-install NVdriver.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/NVdriver.o
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_libdir},%{_mandir}/man{1,8}} \
+       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/fs
 
-gzip -9nf README
+cd src
+install dmsdos-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/fs/dmsdos.o
+install dmsdos.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/fs/dmsdos.o
+
+install libdmsdos.so* $RPM_BUILD_ROOT%{_libdir}
+install cvflist cvftest dmsdosd dmsdosfsck dutil $RPM_BUILD_ROOT%{_sbindir}
+# maybe better to /usr/lib/mc/extfs in separate subpackage?
+install mcdmsdos $RPM_BUILD_ROOT%{_bindir}
+
+cd ../man
+install dmsdosfsck.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install cvf*.1 dmsdosd.1 dutil.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install mcdmsdos.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+cd ..
+# note: COPYING file contains only some details, not actual GPL text
+gzip -9nf BUGS COPYING NEWS README doc/*
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
+%post  -n kernel-fs-dmsdos
 /sbin/depmod -a
 
-%postun
+%postun        -n kernel-fs-dmsdos
 /sbin/depmod -a
 
-%post -n dmsdos-smp
+%post  -n kernel-smp-fs-dmsdos
 /sbin/depmod -a
 
-%postun -n dmsdos-smp
+%postun        -n kernel-smp-fs-dmsdos
 /sbin/depmod -a
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
-/lib/modules/%{_kernel_ver}/misc/*
+%doc *.gz doc/*.gz
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_libdir}/libdmsdos.so.*.*
+%{_mandir}/man?/*
+
+%files -n kernel-fs-dmsdos
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/fs/*
 
-%files -n dmsdos-smp
+%files -n kernel-smp-fs-dmsdos
 %defattr(644,root,root,755)
-%doc *.gz
-/lib/modules/%{_kernel_ver}smp/misc/*
+/lib/modules/%{_kernel_ver}smp/fs/*