rpms/mono/F-13 mono.spec,1.145,1.146
chkr
chkr at fedoraproject.org
Wed Feb 24 22:43:02 UTC 2010
Author: chkr
Update of /cvs/pkgs/rpms/mono/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4535
Modified Files:
mono.spec
Log Message:
* Mon Feb 22 2010 Christian Krause <chkr at fedoraproject.org> - 2.6.1-2
- Fix upgrade path F12 -> F13 by obsoleting and providing mono-moonlight
- Minor spec file cleanup
Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-13/mono.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- mono.spec 23 Dec 2009 00:28:22 -0000 1.145
+++ mono.spec 24 Feb 2010 22:43:01 -0000 1.146
@@ -2,7 +2,7 @@
Name: mono
Version: 2.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A .NET runtime environment
Group: Development/Languages
@@ -10,13 +10,13 @@ License: MIT
URL: http://www.mono-project.com/Main_Page
# Prereleases are available here
# http://mono.ximian.com/monobuild/preview/sources-preview/
-Source0: http://mono.ximian.com/monobuild/snapshot/sources-trunk/%name-%version.tar.bz2
+Source0: http://ftp.novell.com/pub/mono/sources/mono/mono-%{version}.tar.bz2
Source1: monodir.c
# This key was generated by Tom "spot" Callaway <tcallawa at redhat.com> on Dec 1, 2009
# by running the following command:
# sn -k mono.snk
# You should not regenerate this unless you have a really, really, really good reason.
-Source2: mono.snk
+Source2: mono.snk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bison
@@ -31,7 +31,6 @@ BuildRequires: libunwind-devel
%endif
# Required for mono-libdir.patch
BuildRequires: automake libtool gettext-devel
-Obsoletes: monodoc, monodoc-devel
# Yes, mono actually depends on itself, because
# we deleted the bootstrapping binaries. If you
@@ -62,6 +61,8 @@ metadata access libraries.
Summary: The Mono CIL runtime, suitable for running .NET code
Group: Development/Languages
Requires: libgdiplus
+Obsoletes: mono-moonlight < 2.6
+Provides: mono-moonlight = %{version}-%{release}
%description core
This package contains the core of the Mono runtime including its
@@ -268,13 +269,13 @@ Requires: mono-core = %{version}-%{relea
Development file for monodoc
%package mono-4-preview
-Summary: Provides preview code for C# 4
-Group: Development/Languages
-Requires: mono-core = %{version}-%{release}
+Summary: Provides preview code for C# 4
+Group: Development/Languages
+Requires: mono-core = %{version}-%{release}
%description mono-4-preview
Preview for the new C# 4.0 code
-
+
%define monodir %{_libdir}/mono
%define gac_dll(dll) %{monodir}/gac/%{1} \
%{monodir}/?.0/%{1}.dll \
@@ -753,6 +754,7 @@ install -p -m0644 %{SOURCE2} %{buildroot
%{_libdir}/pkgconfig/monodoc.pc
%files mono-4-preview
+%defattr (-, root, root)
%config (noreplace) %{_sysconfdir}/mono/4.0/*.config
%config (noreplace) %{_sysconfdir}/mono/4.0/settings.map
%dir %{monodir}/4.0
@@ -766,6 +768,10 @@ install -p -m0644 %{SOURCE2} %{buildroot
%gac_dll System.Dynamic
%changelog
+* Mon Feb 22 2010 Christian Krause <chkr at fedoraproject.org> - 2.6.1-2
+- Fix upgrade path F12 -> F13 by obsoleting and providing mono-moonlight
+- Minor spec file cleanup
+
* Mon Dec 21 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6.1-1
- Minor fixes
More information about the scm-commits
mailing list