rpms/gnome-sharp/devel gnome-sharp-libdir.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gnome-sharp-2.16.0-gtkhtml3-3.14.patch, 1.1, 1.2 gnome-sharp.spec, 1.9, 1.10 sources, 1.3, 1.4
Xavier LAMIEN (laxathom)
fedora-extras-commits at redhat.com
Fri Apr 11 17:51:49 UTC 2008
Author: laxathom
Update of /cvs/pkgs/rpms/gnome-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22577
Modified Files:
.cvsignore gnome-sharp-2.16.0-gtkhtml3-3.14.patch
gnome-sharp.spec sources
Added Files:
gnome-sharp-libdir.patch
Log Message:
updated files
gnome-sharp-libdir.patch:
--- NEW FILE gnome-sharp-libdir.patch ---
diff -up gnome-sharp-2.16.1/vte/vte-sharp-2.0.pc.in.false gnome-sharp-2.16.1/vte/vte-sharp-2.0.pc.in
--- gnome-sharp-2.16.1/vte/vte-sharp-2.0.pc.in.false 2008-04-11 14:55:02.000000000 +0200
+++ gnome-sharp-2.16.1/vte/vte-sharp-2.0.pc.in 2008-04-11 14:55:32.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
gapidir=${prefix}/share/gapi-2.0
diff -up gnome-sharp-2.16.1/art/art-sharp-2.0.pc.in.false gnome-sharp-2.16.1/art/art-sharp-2.0.pc.in
--- gnome-sharp-2.16.1/art/art-sharp-2.0.pc.in.false 2008-04-11 14:49:23.000000000 +0200
+++ gnome-sharp-2.16.1/art/art-sharp-2.0.pc.in 2008-04-11 14:49:48.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
gapidir=${prefix}/share/gapi-2.0
diff -up gnome-sharp-2.16.1/gnome/gnome-sharp-2.0.pc.in.false gnome-sharp-2.16.1/gnome/gnome-sharp-2.0.pc.in
--- gnome-sharp-2.16.1/gnome/gnome-sharp-2.0.pc.in.false 2008-04-11 14:55:57.000000000 +0200
+++ gnome-sharp-2.16.1/gnome/gnome-sharp-2.0.pc.in 2008-04-11 14:56:08.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
gapidir=${prefix}/share/gapi-2.0
diff -up gnome-sharp-2.16.1/gtkhtml/gtkhtml-sharp-2.0.pc.in.false gnome-sharp-2.16.1/gtkhtml/gtkhtml-sharp-2.0.pc.in
--- gnome-sharp-2.16.1/gtkhtml/gtkhtml-sharp-2.0.pc.in.false 2008-04-11 14:56:30.000000000 +0200
+++ gnome-sharp-2.16.1/gtkhtml/gtkhtml-sharp-2.0.pc.in 2008-04-11 14:56:41.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
gapidir=${prefix}/share/gapi-2.0
diff -up gnome-sharp-2.16.1/rsvg/rsvg-sharp-2.0.pc.in.false gnome-sharp-2.16.1/rsvg/rsvg-sharp-2.0.pc.in
--- gnome-sharp-2.16.1/rsvg/rsvg-sharp-2.0.pc.in.false 2008-04-11 14:58:58.000000000 +0200
+++ gnome-sharp-2.16.1/rsvg/rsvg-sharp-2.0.pc.in 2008-04-11 14:59:14.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
gapidir=${prefix}/share/gapi-2.0
diff -up gnome-sharp-2.16.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in.false gnome-sharp-2.16.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in
--- gnome-sharp-2.16.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in.false 2008-04-11 14:50:25.000000000 +0200
+++ gnome-sharp-2.16.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in 2008-04-11 14:50:40.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
gapidir=${prefix}/share/gapi-2.0
diff -up gnome-sharp-2.16.1/gconf/tools/Makefile.am.false gnome-sharp-2.16.1/gconf/tools/Makefile.am
--- gnome-sharp-2.16.1/gconf/tools/Makefile.am.false 2008-04-11 15:10:29.000000000 +0200
+++ gnome-sharp-2.16.1/gconf/tools/Makefile.am 2008-04-11 15:11:21.000000000 +0200
@@ -1,4 +1,4 @@
-assemblydir = $(prefix)/lib/gtk-sharp-2.0
+assemblydir = $(libdir)/gtk-sharp-2.0
assembly_DATA = gconfsharp-schemagen.exe
bin_SCRIPTS = gconfsharp2-schemagen
CLEANFILES = gconfsharp-schemagen.exe
diff -up gnome-sharp-2.16.1/gconf/tools/gconfsharp2-schemagen.in.false gnome-sharp-2.16.1/gconf/tools/gconfsharp2-schemagen.in
--- gnome-sharp-2.16.1/gconf/tools/gconfsharp2-schemagen.in.false 2008-04-11 14:52:04.000000000 +0200
+++ gnome-sharp-2.16.1/gconf/tools/gconfsharp2-schemagen.in 2008-04-11 14:54:12.000000000 +0200
@@ -1,2 +1,3 @@
#!/bin/sh
- at RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@"
+d=`monodir`
+ at RUNTIME@ $d/../gtk-sharp-2.0/gconfsharp-schemagen.exe "$@"
diff -up gnome-sharp-2.16.1/gconf/GConf/gconf-sharp-2.0.pc.in.false gnome-sharp-2.16.1/gconf/GConf/gconf-sharp-2.0.pc.in
--- gnome-sharp-2.16.1/gconf/GConf/gconf-sharp-2.0.pc.in.false 2008-04-11 14:51:24.000000000 +0200
+++ gnome-sharp-2.16.1/gconf/GConf/gconf-sharp-2.0.pc.in 2008-04-11 14:51:36.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
Name: GConf#
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 21 Aug 2006 19:04:46 -0000 1.3
+++ .cvsignore 11 Apr 2008 17:50:45 -0000 1.4
@@ -1 +1 @@
-gnome-sharp-2.16.0.tar.bz2
+gnome-sharp-2.16.1.tar.bz2
gnome-sharp-2.16.0-gtkhtml3-3.14.patch:
Index: gnome-sharp-2.16.0-gtkhtml3-3.14.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/gnome-sharp-2.16.0-gtkhtml3-3.14.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-sharp-2.16.0-gtkhtml3-3.14.patch 17 Jul 2007 20:08:00 -0000 1.1
+++ gnome-sharp-2.16.0-gtkhtml3-3.14.patch 11 Apr 2008 17:50:45 -0000 1.2
@@ -1,18 +1,27 @@
---- gnome-sharp-2.16.0/configure.in 2006-08-21 12:46:13.000000000 -0400
-+++ gnome-sharp-2.16.0/configure.in.false 2007-07-19 18:47:22.000000000 -0400
-@@ -195,11 +195,11 @@
+--- gnome-sharp-2.16.1/configure.in.false3 2008-04-11 18:51:02.000000000 +0200
++++ gnome-sharp-2.16.1/configure.in 2008-04-11 19:28:35.000000000 +0200
+@@ -195,6 +195,15 @@
PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no)
if test "x$enable_gnome" = "xyes"; then
--GTKHTML_REQUIRED_VERSION=3.8.0
--PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
+GTKHTML_REQUIRED_VERSION=3.14.0
+PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
- if test "x$enable_gtkhtml" = "xyes"; then
--GTKHTML_VERSION=3.8
--GTKHTML_SOVERSION=15
++if test "x$enable_gtkhtml" = "xyes"; then
+GTKHTML_VERSION=3.14
+GTKHTML_SOVERSION=19
++else
++GTKHTML_REQUIRED_VERSION=3.14.0
++PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
++if test "x$enable_gnome" = "xyes"; then
+ GTKHTML_REQUIRED_VERSION=3.8.0
+ PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
+ if test "x$enable_gtkhtml" = "xyes"; then
+@@ -225,6 +234,8 @@
+ fi
+ fi
+ fi
++fi
++fi
+ AC_SUBST(GTKHTML_VERSION)
+ AC_SUBST(GTKHTML_SOVERSION)
else
- GTKHTML_REQUIRED_VERSION=3.6.0
- PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.6 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
Index: gnome-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/gnome-sharp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-sharp.spec 19 Feb 2008 10:46:47 -0000 1.9
+++ gnome-sharp.spec 11 Apr 2008 17:50:45 -0000 1.10
@@ -1,6 +1,6 @@
Name: gnome-sharp
-Version: 2.16.0
-Release: 6%{?dist}
+Version: 2.16.1
+Release: 1%{?dist}
Summary: GTK+ and GNOME bindings for Mono
Group: System Environment/Libraries
@@ -9,9 +9,11 @@
Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.16/gnome-sharp-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: gnome-sharp-2.15.0-libdir.patch
-Patch2: %{name}-2.16.0-automake-1.10.patch
+Patch1: %{name}-libdir.patch
+# Added by upstream
+#Patch2: %{name}-2.16.0-automake-1.10.patch
Patch3: %{name}-2.16.0-gtkhtml3-3.14.patch
+Patch4: %{name}-2.16.1-assemblydir.patch
BuildRequires: mono-devel gtk2-devel libart_lgpl-devel gnome-vfs2-devel libgnomecanvas-devel libgnomeui-devel
BuildRequires: gtk-sharp2-devel >= 2.10.0
@@ -43,8 +45,10 @@
%prep
%setup -n gnome-sharp-%{version}
%patch1 -p1 -b .libdir
-%patch2 -p1 -b .automake-1.10
+# Added by upstream
+#%patch2 -p1 -b .automake-1.10
%patch3 -p1 -b .gtkhtml3-3.14
+#%patch4 -p1 -b .assemblydir
%build
@@ -52,6 +56,7 @@
aclocal
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
+#export MONO_CAIRO_LIBS="${_libdir}/mono/1.0/Mono.Cairo.dll"
%configure
make
@@ -80,8 +85,15 @@
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/*-sharp-2.0.pc
+%{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc
%changelog
+* Fri Apr 11 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.16.1-1
+- Updated Release.
+
+* Thu Mar 05 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.16.0-7
+- Fixed Assembly_dir on Rawhide (bug #434280).
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.16.0-6
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 21 Aug 2006 19:04:46 -0000 1.3
+++ sources 11 Apr 2008 17:50:45 -0000 1.4
@@ -1 +1 @@
-09034669acec52f9d9818d9a31c032d5 gnome-sharp-2.16.0.tar.bz2
+d8889e5caad5d8d7215d263ae49d94d3 gnome-sharp-2.16.1.tar.bz2
More information about the fedora-extras-commits
mailing list