Author: spturtle
Date: Mon Feb 12 21:23:38 2007
New Revision: 120158
Added:
packages/cooker/mol/current/SOURCES/mol-0.9.72_pre2.tar.bz2 (contents,
props changed)
Removed:
packages/cooker/mol/current/SOURCES/mol-0.9.71-gcc4-2.6.12.patch.bz2
packages/cooker/mol/current/SOURCES/mol-0.9.71-pre1.tar.bz2
packages/cooker/mol/current/SOURCES/mol-0.9.71-skbuff-mac-fix.patch.bz2
Modified:
packages/cooker/mol/current/SPECS/mol.spec
Log:
- 0.9.72_pre2
- drop patch 1 and 3 - fixed upstream
- hardcode kernel source version as there's no easy way to build-depend
on the latest version and determine the version from the specfile
Added: packages/cooker/mol/current/SOURCES/mol-0.9.72_pre2.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/mol/current/SPECS/mol.spec
==============================================================================
--- packages/cooker/mol/current/SPECS/mol.spec (original)
+++ packages/cooker/mol/current/SPECS/mol.spec Mon Feb 12 21:23:38 2007
@@ -1,7 +1,9 @@
-%define kversion %(rpm -q --qf '%%{version}-%%{release}' kernel-source-2.6)
-%define krelease %(rpm -q --qf '%%{release}' kernel-source-2.6)
-%define kname %(rpm -q --qf '%%{version}.%%{release}' kernel-source-2.6)
-%define kernel_tree $RPM_BUILD_DIR/mol-%{source_version}/linux-%{kversion}
+# kernel-source-2.6.17.9mdv
+%define kver 2.6.17
+%define krelease 9mdv
+%define kversion %{kver}-%{krelease}
+%define kname %{kver}.%{krelease}
+%define kernel_tree
$RPM_BUILD_DIR/mol-%{source_version}%{source_pre}/linux-%{kversion}
# default is to build mol and build kmods
# use --without mol to disable mol build
# use --without kmods to disable kmods build
@@ -12,23 +14,21 @@
%{?_with_mol: %global build_mol 1}
%{?_with_kmods: %global build_kmods 1}
-%define source_version 0.9.71
-%define source_pre -pre1
-%define package_version 0.9.70
+%define source_version 0.9.72
+%define source_pre _pre2
+%define package_version 0.9.71
Summary: Native MacOS emulator
Name: mol
Version: %{package_version}
-Release: 8mdk
+Release: %mkrel 1
License: GPL
Group: Emulators
Source:
http://www.maconlinux.com/downloads/%{name}-%{source_version}%{source_pre}.tar.bz2
Source1: mol_16.png
Source2: mol_32.png
Source3: mol_48.png
-Patch1: mol-0.9.71-skbuff-mac-fix.patch.bz2
Patch2: mol-0.9.71-kmod-unresolved-symbols.patch.bz2
-Patch3: mol-0.9.71-gcc4-2.6.12.patch.bz2
URL: http://www.maconlinux.com/
BuildRoot: %_tmppath/%{name}-%{version}-root
BuildRequires: XFree86-devel png-devel
@@ -44,9 +44,9 @@
Summary: Mac-on-Linux kernel modules
Group: Emulators
Provides: mol-kernel-modules
-BuildRequires: kernel-source-2.6
+BuildRequires: kernel-source-%{kname}
BuildRequires: bison flex
-BuildConflicts: kernel-source-stripped-2.6
+BuildConflicts: kernel-source-stripped-%{kname}
Requires: kernel-%{kname}
%description kmods
@@ -57,10 +57,8 @@
%prep
-%setup -q -n %{name}-%{source_version}
-%patch1 -p1 -b .skbuff-mac-fix
+%setup -q -n %{name}-%{source_version}%{source_pre}
%patch2 -p1 -b .unresolved-symbols
-%patch3 -p1 -b .gcc4
# (sb) copy kernel-source tree, so we can build as a normal user
# this will fail if permissions are too restrictive on kernel-source
@@ -214,6 +212,7 @@
%_bindir/startmol
%_bindir/molvconfig
%_bindir/molrcget
+%_bindir/mol-img
%dir %_mol_libdir
%dir %_mol_datadir
@@ -234,7 +233,7 @@
%_mol_datadir/config/molrc.sys
%_mol_datadir/config/molrc.post
-%dir %_mol_localstatedir
+%_mol_localstatedir/nvram.x
%{_menudir}/mol
%{_menudir}/molOSX
