SPECS (DEVEL): mol.spec - fixes

sparky sparky at pld-linux.org
Thu Nov 16 20:36:44 CET 2006


Author: sparky                       Date: Thu Nov 16 19:36:44 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- fixes

---- Files affected:
SPECS:
   mol.spec (1.39.2.8 -> 1.39.2.9) 

---- Diffs:

================================================================
Index: SPECS/mol.spec
diff -u SPECS/mol.spec:1.39.2.8 SPECS/mol.spec:1.39.2.9
--- SPECS/mol.spec:1.39.2.8	Sun Nov 12 19:14:40 2006
+++ SPECS/mol.spec	Thu Nov 16 20:36:39 2006
@@ -28,20 +28,15 @@
 #Source0:	http://www.maconlinux.org/downloads/%{name}-%{version}.tgz
 Source0:	http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/%{name}-%{version}.tar.bz2
 # Source0-md5:	3eaa51927191b03b06828609a1122307
-#Source1:	mol.init
 Patch0:		%{name}-iquote.patch
 URL:		http://www.maconlinux.org/
 #BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-#BuildRequires:	bison
-#BuildRequires:	flex
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 BuildRequires:	ncurses-devel
-BuildRequires:	rpmbuild(macros) >= 1.329
-Requires(post,preun):	/sbin/chkconfig
+BuildRequires:	rpmbuild(macros) >= 1.330
 Requires:	dev >= 2.8.0-24
-Requires:	kernel(mol)
 ExclusiveArch:	ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -68,7 +63,10 @@
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Applications/Emulators
 Requires(post,postun):	/sbin/depmod
-Provides:	kernel(mol)
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
 
 %description -n kernel%{_alt_kernel}-%{name}
 This package contains the Mac-on-Linux kernel module needed by MOL. It
@@ -84,7 +82,10 @@
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Applications/Emulators
 Requires(post,postun):	/sbin/depmod
-Provides:	kernel(mol)
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
 
 %description -n kernel%{_alt_kernel}-smp-%{name}
 This package contains the Mac-on-Linux kernel module needed by MOL. It
@@ -190,9 +191,7 @@
 %endif
 
 %if %{with kernel}
-cd obj-ppc/build/src
-%install_kernel_modules -m kmod/mol,netdriver/sheep -d misc
-cd -
+%install_kernel_modules -m obj-ppc/build/src/{kmod/mol,netdriver/sheep} -d misc
 %endif
 
 %clean
@@ -235,7 +234,7 @@
 %if %{with debugger}
 %attr(755,root,root) %{_mol_libdir}/bin/moldeb
 %endif
-%attr(755,root,root) %{_mol_libdir}/mol.symbols
+%{_mol_libdir}/mol.symbols
 %dir %{_mol_datadir}
 %{_mol_datadir}/images
 %{_mol_datadir}/oftrees
@@ -273,6 +272,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39.2.9  2006/11/16 19:36:39  sparky
+- fixes
+
 Revision 1.39.2.8  2006/11/12 18:14:40  sparky
 - nicer
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mol.spec?r1=1.39.2.8&r2=1.39.2.9&f=u



More information about the pld-cvs-commit mailing list