Author: wade
Date: 2007-11-19 21:03:33 -0500 (Mon, 19 Nov 2007)
New Revision: 89956
Modified:
trunk/release/packaging/rpm_defs/mono-core/mono-core.spec
trunk/release/windows-installer/buildwindows-installer
Log:
Changes for 1.2.6 preview 2
Modified: trunk/release/packaging/rpm_defs/mono-core/mono-core.spec
===================================================================
--- trunk/release/packaging/rpm_defs/mono-core/mono-core.spec 2007-11-20
00:40:21 UTC (rev 89955)
+++ trunk/release/packaging/rpm_defs/mono-core/mono-core.spec 2007-11-20
02:03:33 UTC (rev 89956)
@@ -27,6 +27,8 @@
Provides: mono-xml-relaxng
Provides: mono-posix
Provides: mono-ziplib
+Conflicts: helix-banshee <= 0.12.0
+Conflicts: f-spot <= 0.3.5
# Require when in the buildserivce
%if 0%{?opensuse_bs}
Modified: trunk/release/windows-installer/buildwindows-installer
===================================================================
--- trunk/release/windows-installer/buildwindows-installer 2007-11-20
00:40:21 UTC (rev 89955)
+++ trunk/release/windows-installer/buildwindows-installer 2007-11-20
02:03:33 UTC (rev 89956)
@@ -79,7 +79,7 @@
## Total hack to pick the rpm version of mono-basic
(contains compiler and runtime) instead of the zip version (only has the
runtime)
if pack == "mono-basic":
- self.pack_objs[pack] =
packaging.package(packaging.buildconf('suse-100-i586', exclusive=False),pack)
+ self.pack_objs[pack] =
packaging.package(packaging.buildconf('suse-101-i586', exclusive=False),pack)
else:
self.pack_objs[pack] =
packaging.package(installer_conf,pack)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches