rpms/monodevelop/devel monodevelop-libdir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 monodevelop.spec, 1.5, 1.6 sources, 1.2, 1.3 monodevelop-config.patch, 1.1, NONE monodevelop-r62648.patch, 1.1, NONE

Wed Sep 6 23:08:44 UTC 2006

Author: pfj

Update of /cvs/extras/rpms/monodevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/devel

Modified Files:
	.cvsignore monodevelop.spec sources 
Added Files:
	monodevelop-libdir.patch 
Removed Files:
	monodevelop-config.patch monodevelop-r62648.patch 
Log Message:
auto-import monodevelop-0.12-1 on branch devel from monodevelop-0.12-1.src.rpm

monodevelop-libdir.patch:

--- NEW FILE monodevelop-libdir.patch ---
--- monodevelop-0.12/configure.in	2006-09-05 20:36:06.000000000 +0100
+++ monodevelop-0.12/configure-new.in	2006-09-06 23:33:01.000000000 +0100
@@ -290,7 +290,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.12/Makefile.am	2006-09-05 20:36:06.000000000 +0100
+++ monodevelop-0.12/Makefile-new.am	2006-09-06 23:33:26.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.12/mdtool.in	2006-09-05 20:36:06.000000000 +0100
+++ monodevelop-0.12/mdtool-new.in	2006-09-06 23:33:46.000000000 +0100
@@ -16,7 +16,7 @@
     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/
--- monodevelop-0.12/monodevelop.in	2006-09-05 20:36:06.000000000 +0100
+++ monodevelop-0.12/monodevelop-new.in	2006-09-06 23:34:06.000000000 +0100
@@ -31,7 +31,7 @@
 	exit 1
 fi
 
-MD_BIN_PATH=@prefix@/lib/monodevelop/bin
+MD_BIN_PATH=@libdir@/monodevelop/bin
 
 if [ -n $LD_LIBRARY_PATH ]; then
 	export LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
--- monodevelop-0.12/monodevelop.pc.in	2006-09-05 20:36:06.000000000 +0100
+++ monodevelop-0.12/monodevelop-new.pc.in	2006-09-06 23:34:29.000000000 +0100
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
                                                                                 
 Name: MonoDevelop
 Description: Free .NET Development Environment


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Aug 2006 10:14:36 -0000	1.2
+++ .cvsignore	6 Sep 2006 23:08:44 -0000	1.3
@@ -1 +1 @@
-monodevelop-0.11.tar.gz
+monodevelop-0.12.tar.gz


Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- monodevelop.spec	4 Sep 2006 21:48:21 -0000	1.5
+++ monodevelop.spec	6 Sep 2006 23:08:44 -0000	1.6
@@ -1,4 +1,4 @@
-%if "%{fedora}" == "5"
+%if "%{?fedora}" == "5"
 %define monodir %{_prefix}/lib
 %else
 %define monodir %{_libdir}
@@ -6,23 +6,20 @@
 
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
-Version: 0.11
-Release: 21%{?dist}
+Version: 0.12
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
 URL: http://go-mono.com/sources/%{name}/
-%if "%{fedora}" > "5"
-Patch0: monodevelop-config.patch
-Patch1: monodevelop-r62648.patch
-%endif
+Patch0: monodevelop-libdir.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-devel, gtk-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: mono-devel, gtk-sharp2, intltool, gettext, bytefx-data-mysql,  mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, ikvm-devel
 %if "%{?fedora}" == "5"
-BuildRequires: gecko-sharp2 gtk-sharp2
+BuildRequires: gecko-sharp2 gtk-sharp2 mono-nunit
 %else
 BuildRequires: gecko-sharp2-devel gtk-sharp2-devel gnome-sharp-devel
-BuildRequires: autoconf libtool automake
+BuildRequires: autoconf libtool automake mono-nunit-devel
 %endif
 
 Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-nunit mono-data-postgresql mono-data-sybase mono-data-oracle
@@ -45,14 +42,13 @@
 
 %prep
 %setup -q 
-%if "%{fedora}" > "5"
-%patch0 -p1
-%patch1 -p1
-autoreconf
+%if "%{?fedora}" > "5"
+%patch0 -p1 -b .orig
+autoreconf -f -i -s
 %endif
 
 %build
-%configure --enable-boo --enable-java --enable-versioncontrol --libdir=%{monodir}
+%configure --enable-boo --enable-java --enable-versioncontrol
 make
 # no smp flags as it falls over during the build (race condition)
 
@@ -67,12 +63,12 @@
         %{buildroot}%{_datadir}/applications/monodevelop.desktop
 
 %post
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null ||:
+update-desktop-database &> /dev/null ||:
 
 %postun
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null ||:
+update-desktop-database &> /dev/null ||:
 
 %files -f %{name}.lang
 %defattr (-,root,root,-)
@@ -100,6 +96,12 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed Sep 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-1
+- Bump to new version
+- Include the patches for all users
+- Fixed so it uses ?fedora (silly me!)
+- Added BR mono-nunit-devel (FC6)
+
 * Mon Sep 04 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-21
 - Revert 64 bit clean for FC-5 and still follow FC guidelines
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2006 10:14:36 -0000	1.2
+++ sources	6 Sep 2006 23:08:44 -0000	1.3
@@ -1 +1 @@
-541a2eba4266b3dd8b8024c409957330  monodevelop-0.11.tar.gz
+860d7c2b0095bd8592bc93fb55203317  monodevelop-0.12.tar.gz


--- monodevelop-config.patch DELETED ---


--- monodevelop-r62648.patch DELETED ---


