rpms/monodevelop/devel monodevelop-config.patch, 1.2, 1.3 monodevelop-libdir.patch, 1.1, 1.2 monodevelop.spec, 1.9, 1.10

Paul F. Johnson (pfj) fedora-extras-commits at redhat.com
Wed Sep 27 20:16:31 UTC 2006


Author: pfj

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

Modified Files:
	monodevelop-libdir.patch monodevelop.spec 
Added Files:
	monodevelop-config.patch 
Log Message:
auto-import monodevelop-0.12-5 on branch devel from monodevelop-0.12-5.src.rpm

monodevelop-config.patch:

Index: monodevelop-config.patch
===================================================================
RCS file: monodevelop-config.patch
diff -N monodevelop-config.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ monodevelop-config.patch	27 Sep 2006 20:16:30 -0000	1.3
@@ -0,0 +1,41 @@
+--- monodevelop-0.12/mdtool.in	2006-09-05 20:36:06.000000000 +0100
++++ monodevelop-0.12/mdtool-new.in	2006-09-27 21:05:41.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-0.12/monodevelop.in	2006-09-05 20:36:06.000000000 +0100
++++ monodevelop-0.12/monodevelop-new.in	2006-09-27 21:06:32.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
+@@ -40,9 +40,9 @@
+ fi
+ 
+ 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
+ 
+ export MOZILLA_FIVE_HOME=$MOZILLA_HOME

monodevelop-libdir.patch:

Index: monodevelop-libdir.patch
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/devel/monodevelop-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monodevelop-libdir.patch	6 Sep 2006 23:08:44 -0000	1.1
+++ monodevelop-libdir.patch	27 Sep 2006 20:16:30 -0000	1.2
@@ -20,28 +20,7 @@
  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 @@


Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- monodevelop.spec	25 Sep 2006 19:49:15 -0000	1.9
+++ monodevelop.spec	27 Sep 2006 20:16:30 -0000	1.10
@@ -7,12 +7,13 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.12
-Release: 4%{?dist}
+Release: 5%{?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-libdir.patch
+Patch1: monodevelop-config.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, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, ikvm-devel boo-devel
 %if "%{?fedora}" == "5"
@@ -44,6 +45,7 @@
 %patch0 -p1 -b .orig
 autoreconf -f -i -s
 %endif
+%patch1 -p1 -b .orig
 
 %build
 %configure --enable-boo --enable-java --enable-versioncontrol
@@ -94,6 +96,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed Sep 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-5
+- pkgconfig fix 
+
 * Mon Sep 25 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.12-4
 - added R mono-nunit
 




More information about the fedora-extras-commits mailing list