rpms/monodevelop/FC-5 monodevelop-config.patch, NONE, 1.1 monodevelop-r62648.patch, NONE, 1.1 monodevelop.spec, 1.2, 1.3
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Sun Sep 3 15:29:59 UTC 2006
Author: pfj
Update of /cvs/extras/rpms/monodevelop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1794/FC-5
Modified Files:
monodevelop.spec
Added Files:
monodevelop-config.patch monodevelop-r62648.patch
Log Message:
auto-import monodevelop-0.11-18 on branch FC-5 from monodevelop-0.11-18.src.rpm
monodevelop-config.patch:
--- NEW FILE monodevelop-config.patch ---
--- monodevelop-0.11/configure.in 2006-05-06 00:26:55.000000000 +0100
+++ monodevelop-0.11/configure.in 2006-08-27 20:58:14.000000000 +0100
@@ -205,7 +205,7 @@
AC_SUBST(CSC_FLAGS)
-MD_DIR='$(prefix)/lib/monodevelop'
+MD_DIR='$(libdir)/monodevelop'
MD_ASSEMBLY_DIR="$MD_DIR/bin"
MD_ADDIN_DIR="$MD_DIR/AddIns"
--- monodevelop-0.11/Makefile.am 2006-05-06 00:26:55.000000000 +0100
+++ monodevelop-0.11/Makefile.am 2006-08-27 20:59:07.000000000 +0100
@@ -15,7 +15,7 @@
pkgconfig_in_files = monodevelop.pc.in
-pkgconfigdir= $(prefix)/lib/pkgconfig
+pkgconfigdir= $(libdir)/pkgconfig
pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
if ENABLE_UPDATE_MIMEDB
--- monodevelop-0.11/monodevelop.pc.in 2006-05-06 00:26:55.000000000 +0100
+++ monodevelop-0.11/monodevelop.pc.in 2006-08-27 20:59:46.000000000 +0100
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
Name: MonoDevelop
Description: Free .NET Development Environment
--- monodevelop-0.11/mdtool.in 2006-05-06 00:26:55.000000000 +0100
+++ monodevelop-0.11/mdtool-new.in 2006-09-03 10:41:12.000000000 +0100
@@ -16,12 +16,12 @@
echo "$ret"
}
-MD_BIN_PATH=@prefix@/lib/monodevelop/bin
+MD_BIN_PATH=@libdir@/monodevelop/bin
if [ -n $PKG_CONFIG_PATH ]; then
- export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:@gtksharp_prefix@/lib/pkgconfig/
+ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:@libdir@/pkgconfig/
else
- export PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/
+ export PKG_CONFIG_PATH=@libdir@/pkgconfig/
fi
ARGS=`reWrite "$@"`
monodevelop-r62648.patch:
--- NEW FILE monodevelop-r62648.patch ---
--- monodevelop-0.11/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs 2006-07-15 20:14:15 UTC (rev 62647)
+++ monodevelop-0.11/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs 2006-07-15 21:11:57 UTC (rev 62648)
@@ -320,7 +320,8 @@
}
#region IClipboardHandler
- bool HasSelection
+ // FIXME: remove when we depend on gtk > 2.10
+ bool _HasSelection
{
get {
TextIter dummy, dummy2;
@@ -330,7 +331,7 @@
public string GetSelectedText ()
{
- if (HasSelection)
+ if (_HasSelection)
{
TextIter select1, select2;
GetSelectionBounds (out select1, out select2);
@@ -369,13 +370,13 @@
void IClipboardHandler.Cut (object sender, EventArgs e)
{
- if (HasSelection)
+ if (_HasSelection)
CutClipboard (clipboard, true);
}
void IClipboardHandler.Copy (object sender, EventArgs e)
{
- if (HasSelection)
+ if (_HasSelection)
CopyClipboard (clipboard);
}
@@ -389,7 +390,7 @@
void IClipboardHandler.Delete (object sender, EventArgs e)
{
- if (HasSelection)
+ if (_HasSelection)
DeleteSelection (true, true);
}
@@ -706,7 +707,7 @@
public int GetLowerSelectionBounds ()
{
- if (HasSelection)
+ if (_HasSelection)
{
TextIter select1, select2;
GetSelectionBounds (out select1, out select2);
--- monodevelop-0.11/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorWidget.cs 2006-07-15 20:14:15 UTC (rev 62647)
+++ monodevelop-0.11/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorWidget.cs 2006-07-15 21:11:57 UTC (rev 62648)
@@ -23,7 +23,7 @@
public SourceEditorBuffer Buffer;
public SourceEditorView View;
public SourceEditorDisplayBindingWrapper DisplayBinding;
- protected PrintJob printJob;
+ protected Gnome.PrintJob printJob;
protected PrintDialog printDialog;
static Gdk.Pixbuf dragIconPixbuf;
Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/FC-5/monodevelop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monodevelop.spec 4 Aug 2006 10:30:00 -0000 1.2
+++ monodevelop.spec 3 Sep 2006 15:29:59 -0000 1.3
@@ -1,19 +1,16 @@
-# This package will be rebuilt when the packaging of mono has become
-# architecture agnostic. For now, this hack is required
-
-%define monodir %{_prefix}/lib
-
Summary: A full-featured IDE for Mono and Gtk sharp
Name: monodevelop
Version: 0.11
-Release: 16%{?dist}
+Release: 18%{?dist}
License: GPL
Group: Development/Tools
Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
URL: http://go-mono.com/sources/%{name}/
+Patch0: monodevelop-config.patch
+Patch1: monodevelop-r62648.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-devel, gtk-sharp2, gecko-sharp2, intltool, gettext, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, mono-nunit, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, ikvm-devel
-BuildRequires: autoconf, automake
+BuildRequires: mono-devel, gtk-sharp2, gecko-sharp2, intltool, gettext, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, mono-nunit, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, ikvm-devel gnome-sharp-devel gtk-sharp2-devel
+BuildRequires: autoconf, automake, libtool
Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-nunit mono-data-postgresql mono-data-sybase mono-data-oracle
%description
@@ -32,10 +29,12 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+autoreconf
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:%{_prefix}/lib/pkgconfig/:%{_datadir}/pkgconfig/:$PKG_CONFIG_PATH
-%configure --enable-boo --enable-java --enable-versioncontrol --libdir=%{monodir}
+%configure --enable-boo --enable-java --enable-versioncontrol --libdir=%{_libdir}
make
# no smp flags as it falls over during the build (race condition)
@@ -62,7 +61,7 @@
%{_bindir}/mdtool
%{_bindir}/monodevelop
%doc AUTHORS COPYING ChangeLog README
-%{monodir}/monodevelop/
+%{_libdir}/monodevelop/
%exclude %{_datadir}/mime/XMLnamespaces
%exclude %{_datadir}/mime/aliases
%{_datadir}/mime/globs
@@ -77,12 +76,18 @@
%files devel
%defattr(-,root,root,-)
-%{monodir}/pkgconfig/monodevelop.pc
+%{_libdir}/pkgconfig/monodevelop.pc
%clean
%{__rm} -rf %{buildroot}
%changelog
+* Sun Sep 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-18
+- Added gtk sharp fix
+
+* Sun Aug 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-17
+- 64 bit goodness restored
+
* Fri Aug 04 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-16
- fixed ownership problem in spec file
- added comment about the libdir hack
More information about the scm-commits
mailing list