From 0f816ce809ad3b6d9a8f2591358b9163e6ab8c24 Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Thu, 11 Jan 2007 09:03:57 +0000 Subject: [PATCH] Bug 227503, 229669. Use gtk-sharp2.x now. This line, and those below, will be ignored-- M gui/Makefile.am M package/linux/CASA.spec.in M adlib/ad_gk/Makefile.am M adlib/Makefile.am M CASA.changes --- CASA/CASA.changes | 5 +++++ CASA/adlib/Makefile.am | 2 +- CASA/adlib/ad_gk/Makefile.am | 2 +- CASA/gui/Makefile.am | 2 +- CASA/package/linux/CASA.spec.in | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CASA/CASA.changes b/CASA/CASA.changes index d72ae260..2d18343f 100644 --- a/CASA/CASA.changes +++ b/CASA/CASA.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 11 13:47:13 MST 2007 - jnorman@novell.com + +- Bug 227503, 229669. Use gtk-sharp2.x now. + ------------------------------------------------------------------- Tue Jan 9 13:25:55 MST 2007 - jnorman@novell.com diff --git a/CASA/adlib/Makefile.am b/CASA/adlib/Makefile.am index 9356f0c4..f8aeb2da 100644 --- a/CASA/adlib/Makefile.am +++ b/CASA/adlib/Makefile.am @@ -56,7 +56,7 @@ CSFILES = $(srcdir)/AssemblyInfo.cs \ $(top_srcdir)/gui/Logger.cs CSFILES_CSC := $(subst /,$(SEP),$(CSFILES)) -CS_FLAGS = $(CSC_LIBFLAG) -pkg:gtk-sharp /d:LINUX +CS_FLAGS = $(CSC_LIBFLAG) -pkg:gtk-sharp-2.0 /d:LINUX CS_RESOURCES = CS_LIBS =$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.GnomeKeyring.dll \ $(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.KWallet.dll \ diff --git a/CASA/adlib/ad_gk/Makefile.am b/CASA/adlib/ad_gk/Makefile.am index 5e3e1b5f..21b8c3f0 100644 --- a/CASA/adlib/ad_gk/Makefile.am +++ b/CASA/adlib/ad_gk/Makefile.am @@ -48,7 +48,7 @@ MODULE_EXT =dll CSFILES = $(srcdir)/GnomeKeyring.cs CSFILES_CSC := $(subst /,$(SEP),$(CSFILES)) -CS_FLAGS = $(CSC_LIBFLAG) /target:library -pkg:gtk-sharp +CS_FLAGS = $(CSC_LIBFLAG) /target:library -pkg:gtk-sharp-2.0 CS_RESOURCES = CS_LIBS = CS_LIBPATH = diff --git a/CASA/gui/Makefile.am b/CASA/gui/Makefile.am index ce245833..ea89fd12 100644 --- a/CASA/gui/Makefile.am +++ b/CASA/gui/Makefile.am @@ -82,7 +82,7 @@ CSFILES =$(srcdir)/AssemblyInfo.cs \ $(srcdir)/Config.cs CSFILES_CSC := $(subst /,$(SEP),$(CSFILES)) -CS_FLAGS = -pkg:gtk-sharp -pkg:glade-sharp -d:LINUX -nowarn:169 +CS_FLAGS = -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 -d:LINUX -nowarn:169 CS_RESOURCES = CS_LIBS = Mono.Posix.dll \ $(CASALIBDIR)/Novell.CASA.Common.dll \ diff --git a/CASA/package/linux/CASA.spec.in b/CASA/package/linux/CASA.spec.in index 93b8a0df..31117e3c 100644 --- a/CASA/package/linux/CASA.spec.in +++ b/CASA/package/linux/CASA.spec.in @@ -17,7 +17,7 @@ Name: @PACKAGE@ URL: http://www.novell.com/products -BuildRequires: gcc-c++ glade-sharp glib-sharp glib2-devel gnome-filesystem gtk-sharp gtk-sharp-gapi gtk2-devel java2-devel-packages mDNSResponder-devel kdelibs3-devel krb5-devel libgssapi libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig qt3-devel libgcc +BuildRequires: gcc-c++ glade-sharp2 glib-sharp2 glib2-devel gnome-filesystem gtk-sharp2 gtk-sharp2-gapi gtk2-devel java2-devel-packages mDNSResponder-devel kdelibs3-devel krb5-devel libgssapi libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig qt3-devel libgcc %define prefix /usr/share/doc/packages %define bin_prefix /usr License: LGPL @@ -58,7 +58,7 @@ for credential storage and single sign-on. Summary: The CASA Console Utility Group: Productivity/Other #Requires: CASA = %{version} gtk-sharp >= 1.0.9 kdelibs3 >= 3.2.1 gtk2 >= 2.4.14 -Requires: CASA = %{version} gtk-sharp >= 1.0.9 gtk2 >= 2.4.14 +Requires: CASA = %{version} gtk-sharp2 >= 2.8.0 gtk2 >= 2.4.14 %description gui This package contains the CASA (Common Authentication Services Adapter)