Author: wade
Date: 2007-12-06 17:45:57 -0500 (Thu, 06 Dec 2007)
New Revision: 90871
Modified:
trunk/release/macosx/buildpackage
trunk/release/packaging/bundles/PRE-RELEASE
trunk/release/packaging/rpm_defs/apache2-mod_mono/apache2-mod_mono.spec
trunk/release/packaging/rpm_defs/mono-core/mono-core.spec
trunk/release/packaging/rpm_defs/xsp/xsp.spec
Log:
rpm_defs:
mono-core:
-conflict with this version of banshee
xsp/mod_mono:
-require one another
macosx:
-update path to pyutils since we moved out of new/
PRE-RELEASE:
-preview version bump
Modified: trunk/release/macosx/buildpackage
===================================================================
--- trunk/release/macosx/buildpackage 2007-12-06 22:24:35 UTC (rev 90870)
+++ trunk/release/macosx/buildpackage 2007-12-06 22:45:57 UTC (rev 90871)
@@ -11,7 +11,7 @@
import distutils.dir_util
import threading
-sys.path += ['../../pyutils']
+sys.path += ['../pyutils']
import config
import utils
import packaging
Modified: trunk/release/packaging/bundles/PRE-RELEASE
===================================================================
--- trunk/release/packaging/bundles/PRE-RELEASE 2007-12-06 22:24:35 UTC (rev
90870)
+++ trunk/release/packaging/bundles/PRE-RELEASE 2007-12-06 22:45:57 UTC (rev
90871)
@@ -4,7 +4,7 @@
bundle_urlname="preview"
-bundle_short_desc="Preview 2"
+bundle_short_desc="Preview 3"
bundle_desc="Preview packages before an official release"
# This is left empty, because versions on RELEASE will always be the latest
from sources/packages
Modified:
trunk/release/packaging/rpm_defs/apache2-mod_mono/apache2-mod_mono.spec
===================================================================
--- trunk/release/packaging/rpm_defs/apache2-mod_mono/apache2-mod_mono.spec
2007-12-06 22:24:35 UTC (rev 90870)
+++ trunk/release/packaging/rpm_defs/apache2-mod_mono/apache2-mod_mono.spec
2007-12-06 22:45:57 UTC (rev 90871)
@@ -27,8 +27,9 @@
Source: %{modname}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: mod_mono = %{version}-%{release}
-Requires: xsp
+# This must be manually entered according to xsp's protocol version
+Requires: xsp >= %{version}
############### Suse based options
%if 0%{?suse_version}
Modified: trunk/release/packaging/rpm_defs/mono-core/mono-core.spec
===================================================================
--- trunk/release/packaging/rpm_defs/mono-core/mono-core.spec 2007-12-06
22:24:35 UTC (rev 90870)
+++ trunk/release/packaging/rpm_defs/mono-core/mono-core.spec 2007-12-06
22:45:57 UTC (rev 90871)
@@ -27,7 +27,11 @@
Provides: mono-xml-relaxng
Provides: mono-posix
Provides: mono-ziplib
-Conflicts: helix-banshee <= 0.12.0
+
+# This version of mono has issues with the following versions of apps:
+# (not because of regressions, but because bugfixes in mono uncover bugs in
the apps)
+Conflicts: helix-banshee <= 0.13.1
+Conflicts: banshee <= 0.13.1
Conflicts: f-spot <= 0.3.5
# Require when in the buildserivce
Modified: trunk/release/packaging/rpm_defs/xsp/xsp.spec
===================================================================
--- trunk/release/packaging/rpm_defs/xsp/xsp.spec 2007-12-06 22:24:35 UTC
(rev 90870)
+++ trunk/release/packaging/rpm_defs/xsp/xsp.spec 2007-12-06 22:45:57 UTC
(rev 90871)
@@ -16,6 +16,11 @@
BuildRequires: mono-devel mono-web pkgconfig
+# This must be manually entered according to xsp's protocol version
+# Since this package is currently noarch, and mod_mono's name is different
+# on different distros, we can't use this... yet
+#Requires: mod_mono >= %{version}
+
##### suse ####
%if 0%{?suse_version}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
