Author: alexl
Update of /cvs/dist/rpms/gtk-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25050
Modified Files:
.cvsignore gtk-sharp2.spec sources
Added Files:
gtk-sharp-2.9.0-libdir.patch gtk-sharp-2.9.0-monodir.patch
Log Message:
* Mon Aug 14 2006 Alexander Larsson <alexl at redhat.com> - 2.9.0-1
- update to 2.9.0, which splits out gnome stuff to gnome-sharp
- Split out devel package
gtk-sharp-2.9.0-libdir.patch:
generator/Makefile.am | 2 +-
glade/glade-sharp-2.0.pc.in | 2 +-
glib/glib-sharp-2.0.pc.in | 2 +-
gtk/gtk-sharp-2.0.pc.in | 2 +-
gtkdotnet/gtk-dotnet-2.0.pc.in | 2 +-
parser/Makefile.am | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE gtk-sharp-2.9.0-libdir.patch ---
--- gtk-sharp-2.9.0/glib/glib-sharp-2.0.pc.in.libdir 2006-08-18 14:08:44.000000000 +0200
+++ gtk-sharp-2.9.0/glib/glib-sharp-2.0.pc.in 2006-08-18 14:10:16.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
Name: GLib#
--- gtk-sharp-2.9.0/parser/Makefile.am.libdir 2006-08-18 11:28:21.000000000 +0200
+++ gtk-sharp-2.9.0/parser/Makefile.am 2006-08-18 11:28:44.000000000 +0200
@@ -1,4 +1,4 @@
-assemblydir = $(prefix)/lib/gtk-sharp-2.0
+assemblydir = $(libdir)/gtk-sharp-2.0
pkgconfigdir = $(libdir)/pkgconfig
assembly_DATA = gapi-fixup.exe gapi-parser.exe
pkgconfig_DATA = gapi-2.0.pc
--- gtk-sharp-2.9.0/generator/Makefile.am.libdir 2006-08-18 11:28:15.000000000 +0200
+++ gtk-sharp-2.9.0/generator/Makefile.am 2006-08-18 11:28:48.000000000 +0200
@@ -1,4 +1,4 @@
-assemblydir = $(prefix)/lib/gtk-sharp-2.0
+assemblydir = $(libdir)/gtk-sharp-2.0
assembly_DATA = gapi_codegen.exe
bin_SCRIPTS = gapi2-codegen
CLEANFILES = gapi_codegen.exe
--- gtk-sharp-2.9.0/gtkdotnet/gtk-dotnet-2.0.pc.in.libdir 2006-08-18 14:08:44.000000000 +0200
+++ gtk-sharp-2.9.0/gtkdotnet/gtk-dotnet-2.0.pc.in 2006-08-18 14:10:08.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
Name: Gtk.DotNet
--- gtk-sharp-2.9.0/gtk/gtk-sharp-2.0.pc.in.libdir 2006-08-18 14:08:44.000000000 +0200
+++ gtk-sharp-2.9.0/gtk/gtk-sharp-2.0.pc.in 2006-08-18 14:09:35.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
gapidir=${prefix}/share/gapi-2.0
--- gtk-sharp-2.9.0/glade/glade-sharp-2.0.pc.in.libdir 2006-08-18 14:08:44.000000000 +0200
+++ gtk-sharp-2.9.0/glade/glade-sharp-2.0.pc.in 2006-08-18 14:10:23.000000000 +0200
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
gapidir=${prefix}/share/gapi-2.0
gtk-sharp-2.9.0-monodir.patch:
generator/gapi2-codegen.in | 5 ++---
parser/gapi2-fixup.in | 5 ++---
parser/gapi2-parser.in | 7 +++----
3 files changed, 7 insertions(+), 10 deletions(-)
--- NEW FILE gtk-sharp-2.9.0-monodir.patch ---
--- gtk-sharp-2.9.0/parser/gapi2-fixup.in.monodir 2006-08-18 10:14:36.000000000 +0200
+++ gtk-sharp-2.9.0/parser/gapi2-fixup.in 2006-08-18 10:16:24.000000000 +0200
@@ -1,6 +1,5 @@
#!/bin/sh
-a=`which "$0"`
-d=`dirname "$a"`
+d=`monodir`
- at RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi-fixup.exe "$@"
+ at RUNTIME@ $d/../gtk-sharp-2.0/gapi-fixup.exe "$@"
--- gtk-sharp-2.9.0/parser/gapi2-parser.in.monodir 2006-08-18 10:14:46.000000000 +0200
+++ gtk-sharp-2.9.0/parser/gapi2-parser.in 2006-08-18 10:16:03.000000000 +0200
@@ -1,7 +1,6 @@
#!/bin/sh
-a=`which "$0"`
-d=`dirname "$a"`
+d=`monodir`
-export PATH=$d/../lib/gtk-sharp-2.0:$PATH
- at RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi-parser.exe "$@"
+export PATH=$d/../gtk-sharp-2.0:$PATH
+ at RUNTIME@ $d/../gtk-sharp-2.0/gapi-parser.exe "$@"
--- gtk-sharp-2.9.0/generator/gapi2-codegen.in.monodir 2006-08-18 10:14:18.000000000 +0200
+++ gtk-sharp-2.9.0/generator/gapi2-codegen.in 2006-08-18 10:16:35.000000000 +0200
@@ -1,6 +1,5 @@
#!/bin/sh
-a=`which "$0"`
-d=`dirname "$a"`
+d=`monodir`
- at RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi_codegen.exe "$@"
+ at RUNTIME@ $d/../gtk-sharp-2.0/gapi_codegen.exe "$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 4 Mar 2006 02:22:18 -0000 1.5
+++ .cvsignore 18 Aug 2006 15:06:19 -0000 1.6
@@ -1 +1 @@
-gtk-sharp-2.8.2.tar.gz
+gtk-sharp-2.9.0.tar.bz2
Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gtk-sharp2.spec 12 Jul 2006 06:17:42 -0000 1.14
+++ gtk-sharp2.spec 18 Aug 2006 15:06:19 -0000 1.15
@@ -1,19 +1,18 @@
Name: gtk-sharp2
-Version: 2.8.2
-Release: 2.1
+Version: 2.9.0
+Release: 1%{?dist}
Summary: GTK+ and GNOME bindings for Mono
Group: System Environment/Libraries
License: LGPL
URL: http://gtk-sharp.sf.net
-Source0: gtk-sharp-%{version}.tar.gz
+Source0: gtk-sharp-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: gtk-sharp2-vtelibs.patch
+Patch1: gtk-sharp-2.9.0-monodir.patch
+Patch2: gtk-sharp-2.9.0-libdir.patch
-BuildRequires: mono-devel gtk2-devel libart_lgpl-devel gnome-vfs2-devel libgnomecanvas-devel libgnomeui-devel
-BuildRequires: libglade2-devel librsvg2-devel gtkhtml3-devel vte-devel gnome-panel-devel
-BuildRequires: libgnomeprintui22-devel
+BuildRequires: mono-devel gtk2-devel libglade2-devel
BuildRequires: automake, libtool
# Mono only availible on these:
@@ -25,8 +24,7 @@
fully native graphical GNOME applications using Mono. Gtk#
is a binding to GTK+, the cross platform user interface
toolkit used in GNOME. It includes bindings for Gtk, Atk,
-Pango, Gdk, libgnome, libgnomeui and libgnomecanvas. Gtk#
-2.4.x binds GTK+ 2.4.
+Pango, Gdk.
%package gapi
Group: Development/Languages
@@ -37,20 +35,25 @@
This package provides developer tools for the creation and
maintainance of managed bindings to native libraries which utilize
glib and GObject. Some examples of libraries currently bound using
-the GAPI tools and found in Gtk# include Gtk, Atk, Pango, Gdk,
-libgnome, libgnomeui and libgnomecanvas.
+the GAPI tools and found in Gtk# include Gtk, Atk, Pango, Gdk.
+
+%package devel
+Summary: files needed for developing with gtk-sharp2
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkg-config
+
+%description devel
+This package provides the necessary development libraries and headers
+for writing gtk-sharp2 applications.
%prep
%setup -n gtk-sharp-%{version}
-%patch1 -p1 -b .vte
+%patch1 -p1 -b .monodir
+%patch2 -p1 -b .libdir
%build
-
-# need to re-automake for gtk-sharp2-vtelibs.patch
-aclocal
-libtoolize --force
-automake --add-missing
-autoconf
+autoreconf --force --install
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
%configure
@@ -59,40 +62,46 @@
%install
%{__rm} -rf $RPM_BUILD_ROOT
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp /gacdir %{_prefix}/lib /root ${RPM_BUILD_ROOT}%{_prefix}/lib"
+make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacdir %{_libdir} /root ${RPM_BUILD_ROOT}%{_libdir}"
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.*a
-mv $RPM_BUILD_ROOT%{_prefix}/lib/mono/gtk-sharp $RPM_BUILD_ROOT%{_prefix}/lib/mono/gtk-sharp-2.0
-
%clean
%{__rm} -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README
%{_libdir}/*.so
-%dir %{_prefix}/lib/gtk-sharp-2.0
-%{_prefix}/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
-%{_bindir}/gconfsharp2-schemagen
-%{_prefix}/lib/mono/gac
-%{_prefix}/lib/mono/gtk-sharp-2.0
-%{_libdir}/pkgconfig/*-sharp-2.0.pc
-%{_libdir}/pkgconfig/gtk-dotnet-2.0.pc
+%dir %{_libdir}/gtk-sharp-2.0
+%{_libdir}/mono/gac
+%{_libdir}/mono/gtk-sharp-2.0
%files gapi
%defattr(-,root,root,-)
%{_bindir}/gapi2-codegen
%{_bindir}/gapi2-fixup
%{_bindir}/gapi2-parser
-%{_prefix}/lib/gtk-sharp-2.0/gapi_codegen.exe
-%{_prefix}/lib/gtk-sharp-2.0/gapi-fixup.exe
-%{_prefix}/lib/gtk-sharp-2.0/gapi-parser.exe
-%{_prefix}/lib/gtk-sharp-2.0/gapi_pp.pl
-%{_prefix}/lib/gtk-sharp-2.0/gapi2xml.pl
+%{_libdir}/gtk-sharp-2.0/gapi_codegen.exe
+%{_libdir}/gtk-sharp-2.0/gapi-fixup.exe
+%{_libdir}/gtk-sharp-2.0/gapi-parser.exe
+%{_libdir}/gtk-sharp-2.0/gapi_pp.pl
+%{_libdir}/gtk-sharp-2.0/gapi2xml.pl
+%{_datadir}/gapi-2.0
%{_libdir}/pkgconfig/gapi-2.0.pc
-%{_prefix}/share/gapi-2.0
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/*-sharp-2.0.pc
+%{_libdir}/pkgconfig/gtk-dotnet-2.0.pc
%changelog
+* Mon Aug 14 2006 Alexander Larsson <alexl at redhat.com> - 2.9.0-1
+- update to 2.9.0, which splits out gnome stuff to gnome-sharp
+- Split out devel package
+
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
- rebuild
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 4 Mar 2006 02:22:18 -0000 1.5
+++ sources 18 Aug 2006 15:06:19 -0000 1.6
@@ -1 +1 @@
-e7b68519ede7fd7521b2c6e10410aefa gtk-sharp-2.8.2.tar.gz
+06228185cdbd34e033817940361e143f gtk-sharp-2.9.0.tar.bz2