diff -pruN CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.am CASA-1.6.659/c_adlib/ad_ff/native/Makefile.am
--- CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.am	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_ff/native/Makefile.am	2007-02-05 14:19:21.000000000 +0100
@@ -58,7 +58,7 @@ CXXFILES = $(srcdir)/Common.cpp \ 
 
 CXXFILES_CXX :=
 INCLUDES =  -I. -I.. -I$(CASAROOT)/include \
--I/opt/gnome/include/gnome-keyring-1 
+-I/usr/include/gnome-keyring-1 
 CXXFLAGS = $(CPP_LIBFLAG) $(INCLUDES) 
 EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NANESPACE \ 
    -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
diff -pruN CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.in CASA-1.6.659/c_adlib/ad_ff/native/Makefile.in
--- CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.in	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_ff/native/Makefile.in	2007-02-05 14:19:21.000000000 +0100
@@ -227,7 +227,7 @@ CXXFILES = $(srcdir)/Common.cpp \
 
 CXXFILES_CXX := 
 INCLUDES = -I. -I.. -I$(CASAROOT)/include \
--I/opt/gnome/include/gnome-keyring-1 
+-I/usr/include/gnome-keyring-1 
 
 CXXFLAGS = $(CPP_LIBFLAG) $(INCLUDES) 
 EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NANESPACE \
diff -pruN CASA-1.6.659.orig/c_adlib/ad_gk/native/link.lux CASA-1.6.659/c_adlib/ad_gk/native/link.lux
--- CASA-1.6.659.orig/c_adlib/ad_gk/native/link.lux	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_gk/native/link.lux	2007-02-05 14:19:21.000000000 +0100
@@ -5,7 +5,7 @@ LINK = $(CPP) \
 	-O2 -fno-exceptions -fno-check-new\
 	-Wl,-rpath -Wl,/usr/lib$(ARC) \
 	-L/usr/lib$(ARC) -lpthread -lc -ldl \
-	-L/opt/gnome/lib$(ARC) -lglib-2.0 \
+	-L/usr/lib$(ARC) -lglib-2.0 \
 	-Wl,-soname -Wl,lib$(TARGET).so.$(PROD_NUM) \
 	-o $(LIBDIR)$(XTRA)/lib$(TARGET).so.$(BLD_VER) \
 	-L$(LIBDIR)$(XTRA)  \
diff -pruN CASA-1.6.659.orig/c_adlib/ad_gk/native/Makefile.am CASA-1.6.659/c_adlib/ad_gk/native/Makefile.am
--- CASA-1.6.659.orig/c_adlib/ad_gk/native/Makefile.am	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_gk/native/Makefile.am	2007-02-05 14:19:21.000000000 +0100
@@ -51,10 +51,10 @@ LIBDIR = $(LIB)
 
 CSFILES_CSC :=
 INCLUDES = -I. -I.. -I$(CASAROOT)/include \
-	-I/opt/gnome/include/gnome-keyring-1 \
-	-I/opt/gnome/include/glib-2.0 \
-	-I/opt/gnome/$(LIBDIR)/glib-2.0/include \
-	-L/opt/gnome/$(LIBDIR) -lglib-2.0
+	-I/usr/include/gnome-keyring-1 \
+	-I/usr/include/glib-2.0 \
+	-I/usr/$(LIBDIR)/glib-2.0/include \
+	-L/usr/$(LIBDIR) -lglib-2.0
 
 RESOURCES =
 EXTRA_CFLAGS = 
@@ -64,7 +64,7 @@ LIBS = -lpthread -ldl
 LDFLAGS = -fno-exceptions -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
 	-Wl,-rpath -Wl,/usr/$(LIBDIR) -Wl,-soname -Wl,libad_gk.so.1
 
-EXTRA_LDFLAGS = -L/opt/gnome/$(LIBDIR) -lglib-2.0 -L/$(CASAROOT)/$(LIBDIR)
+EXTRA_LDFLAGS = -L/usr/$(LIBDIR) -lglib-2.0 -L/$(CASAROOT)/$(LIBDIR)
 
 OBJDIR = ./$(TARGET_CFG)/$(LIBDIR)
 
diff -pruN CASA-1.6.659.orig/c_adlib/ad_gk/native/Makefile.in CASA-1.6.659/c_adlib/ad_gk/native/Makefile.in
--- CASA-1.6.659.orig/c_adlib/ad_gk/native/Makefile.in	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_gk/native/Makefile.in	2007-02-05 14:19:21.000000000 +0100
@@ -220,14 +220,14 @@ CFILES = $(srcdir)/ad_gk.c 
 LIBDIR = $(LIB)
 CSFILES_CSC := 
 INCLUDES = -I. -I.. -I$(CASAROOT)/include \
-	-I/opt/gnome/include/gnome-keyring-1 \
-	-I/opt/gnome/include/glib-2.0 \
-	-I/opt/gnome/$(LIBDIR)/glib-2.0/include \
-	-L/opt/gnome/$(LIBDIR) -lglib-2.0
+	-I/usr/include/gnome-keyring-1 \
+	-I/usr/include/glib-2.0 \
+	-I/usr/$(LIBDIR)/glib-2.0/include \
+	-L/usr/$(LIBDIR) -lglib-2.0
 
 RESOURCES = 
 EXTRA_CFLAGS = 
-EXTRA_LDFLAGS = -L/opt/gnome/$(LIBDIR) -lglib-2.0 -L/$(CASAROOT)/$(LIBDIR)
+EXTRA_LDFLAGS = -L/usr/$(LIBDIR) -lglib-2.0 -L/$(CASAROOT)/$(LIBDIR)
 OBJDIR = ./$(TARGET_CFG)/$(LIBDIR)
 OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
 EXTRA_DIST = $(CFILES) *.h
diff -pruN CASA-1.6.659.orig/c_adlib/ad_kw/native/Makefile.am CASA-1.6.659/c_adlib/ad_kw/native/Makefile.am
--- CASA-1.6.659.orig/c_adlib/ad_kw/native/Makefile.am	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_kw/native/Makefile.am	2007-02-05 14:19:21.000000000 +0100
@@ -56,7 +56,7 @@ CXX_MOC_FILES = kwallets_rw.moc
 
 CXXFILES_CXX :=
 INCLUDES =  -I. -I.. -I$(CASAROOT)/include \
--I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -I/opt/gnome/include/gnome-keyring-1/ 
+-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -I/usr/include/gnome-keyring-1/ 
 CXXFLAGS = $(CPP_LIBFLAG) $(INCLUDES) 
 EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NANESPACE \ 
    -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
diff -pruN CASA-1.6.659.orig/c_common/linux/Makefile.am CASA-1.6.659/c_common/linux/Makefile.am
--- CASA-1.6.659.orig/c_common/linux/Makefile.am	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_common/linux/Makefile.am	2007-02-05 14:19:21.000000000 +0100
@@ -47,7 +47,7 @@ MODULE_EXT =o
 CFILES = ../sscs_ll.c 
 
 CSFILES_CSC :=
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
 EXTRA_CFLAGS = 
 RESOURCES =
 CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
diff -pruN CASA-1.6.659.orig/c_common/linux/Makefile.in CASA-1.6.659/c_common/linux/Makefile.in
--- CASA-1.6.659.orig/c_common/linux/Makefile.in	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_common/linux/Makefile.in	2007-02-05 14:19:21.000000000 +0100
@@ -217,7 +217,7 @@ MODULE_NAME = sscs_ll
 MODULE_EXT = o
 CFILES = ../sscs_ll.c 
 CSFILES_CSC := 
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
 EXTRA_CFLAGS = 
 RESOURCES = 
 OBJDIR = ./$(TARGET_CFG)/$(LIB)
diff -pruN CASA-1.6.659.orig/c_jwrapper/jnsscs/linux/Makefile.am CASA-1.6.659/c_jwrapper/jnsscs/linux/Makefile.am
--- CASA-1.6.659.orig/c_jwrapper/jnsscs/linux/Makefile.am	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_jwrapper/jnsscs/linux/Makefile.am	2007-02-05 14:19:21.000000000 +0100
@@ -50,7 +50,7 @@ CFILES = ../jmicasa.c  
 
 CSFILES_CSC :=
 INCLUDES = -I. -I.. -I$(CASAROOT)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
-           -I/opt/gnome/include/gnome-keyring-1 
+           -I/usr/include/gnome-keyring-1 
 RESOURCES =
 DEFINES = 
 CFLAGS += $(INCLUDES) $(DEFINES)
diff -pruN CASA-1.6.659.orig/c_jwrapper/jnsscs/linux/Makefile.in CASA-1.6.659/c_jwrapper/jnsscs/linux/Makefile.in
--- CASA-1.6.659.orig/c_jwrapper/jnsscs/linux/Makefile.in	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_jwrapper/jnsscs/linux/Makefile.in	2007-02-05 14:19:21.000000000 +0100
@@ -220,7 +220,7 @@ MODULE_EXT = so
 CFILES = ../jmicasa.c  
 CSFILES_CSC := 
 INCLUDES = -I. -I.. -I$(CASAROOT)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
-           -I/opt/gnome/include/gnome-keyring-1 
+           -I/usr/include/gnome-keyring-1 
 
 RESOURCES = 
 DEFINES = 
diff -pruN CASA-1.6.659.orig/c_micasacache/linux/Makefile.am CASA-1.6.659/c_micasacache/linux/Makefile.am
--- CASA-1.6.659.orig/c_micasacache/linux/Makefile.am	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_micasacache/linux/Makefile.am	2007-02-05 14:19:21.000000000 +0100
@@ -49,7 +49,7 @@ CFILES = ../sscs_unx_cache.c \
          ../sscs_ipc.c
 
 CSFILES_CSC :=
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
 EXTRA_CFLAGS = 
 RESOURCES =
 CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
diff -pruN CASA-1.6.659.orig/c_micasacache/linux/Makefile.in CASA-1.6.659/c_micasacache/linux/Makefile.in
--- CASA-1.6.659.orig/c_micasacache/linux/Makefile.in	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_micasacache/linux/Makefile.in	2007-02-05 14:19:21.000000000 +0100
@@ -220,7 +220,7 @@ CFILES = ../sscs_unx_cache.c \
          ../sscs_ipc.c
 
 CSFILES_CSC := 
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
 EXTRA_CFLAGS = 
 RESOURCES = 
 OBJDIR = ./$(TARGET_CFG)/$(LIB)
diff -pruN CASA-1.6.659.orig/c_micasadk/linux/Makefile.am CASA-1.6.659/c_micasadk/linux/Makefile.am
--- CASA-1.6.659.orig/c_micasadk/linux/Makefile.am	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_micasadk/linux/Makefile.am	2007-02-05 14:19:21.000000000 +0100
@@ -51,7 +51,7 @@ CFILES = ../sscs_ll.c \
 	../sscs_ndk.c 
 
 CSFILES_CSC :=
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
 EXTRA_CFLAGS = 
 RESOURCES =
 CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
diff -pruN CASA-1.6.659.orig/c_micasadk/linux/Makefile.in CASA-1.6.659/c_micasadk/linux/Makefile.in
--- CASA-1.6.659.orig/c_micasadk/linux/Makefile.in	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_micasadk/linux/Makefile.in	2007-02-05 14:19:21.000000000 +0100
@@ -224,7 +224,7 @@ CFILES = ../sscs_ll.c \
 	../sscs_ndk.c 
 
 CSFILES_CSC := 
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
 EXTRA_CFLAGS = 
 RESOURCES = 
 OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
diff -pruN CASA-1.6.659.orig/login_capture/PAM/linux/Makefile.am CASA-1.6.659/login_capture/PAM/linux/Makefile.am
--- CASA-1.6.659.orig/login_capture/PAM/linux/Makefile.am	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/login_capture/PAM/linux/Makefile.am	2007-02-05 14:19:21.000000000 +0100
@@ -49,7 +49,7 @@ CFILES = ../pam_sscs_utils.c \
 	../pam_sscs.c 
 
 CSFILES_CSC :=
-INCLUDES = -I. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1
+INCLUDES = -I. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1
 RESOURCES =
 DEFINES= -fno-strict-aliasing
 CFLAGS += $(INCLUDES) $(DEFINES)
diff -pruN CASA-1.6.659.orig/login_capture/PAM/linux/Makefile.in CASA-1.6.659/login_capture/PAM/linux/Makefile.in
--- CASA-1.6.659.orig/login_capture/PAM/linux/Makefile.in	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/login_capture/PAM/linux/Makefile.in	2007-02-05 14:19:21.000000000 +0100
@@ -221,7 +221,7 @@ CFILES = ../pam_sscs_utils.c \
 	../pam_sscs.c 
 
 CSFILES_CSC := 
-INCLUDES = -I. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1
+INCLUDES = -I. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1
 RESOURCES = 
 DEFINES = -fno-strict-aliasing
 OBJDIR = ./$(TARGET_CFG)/$(LIB)
diff -pruN CASA-1.6.659.orig/make/global.mak CASA-1.6.659/make/global.mak
--- CASA-1.6.659.orig/make/global.mak	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/make/global.mak	2007-02-05 14:19:21.000000000 +0100
@@ -61,7 +61,7 @@ incdir = i"." i"$(ROOT)/include" i"$(NWS
 endif
 
 ifeq ($(PLAT),lux)
-incdir = i"." i"$(ROOT)/include" i"/opt/gnome/include/gnome-keyring-1/" 
+incdir = i"." i"$(ROOT)/include" i"/usr/include/gnome-keyring-1/" 
  O = o
 endif
 
diff -pruN CASA-1.6.659.orig/shsrc/lshsrc/CASA-detect_lib64.patch CASA-1.6.659/shsrc/lshsrc/CASA-detect_lib64.patch
--- CASA-1.6.659.orig/shsrc/lshsrc/CASA-detect_lib64.patch	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/shsrc/lshsrc/CASA-detect_lib64.patch	2007-02-05 14:19:21.000000000 +0100
@@ -282,7 +282,7 @@
 -fi
 +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"`
  
- export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
+ export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/usr/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
  
 --- shsrc/lshsrc/mk-micasa_gk-ol
 +++ shsrc/lshsrc/mk-micasa_gk-ol
@@ -298,7 +298,7 @@
 -fi
 +ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"`
  
- export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
+ export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/usr/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
  
 --- shsrc/lshsrc/mk-micasa_gkwrap-dl
 +++ shsrc/lshsrc/mk-micasa_gkwrap-dl
diff -pruN CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_gk-dl CASA-1.6.659/shsrc/lshsrc/mk-micasa_gk-dl
--- CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_gk-dl	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/shsrc/lshsrc/mk-micasa_gk-dl	2007-02-05 14:19:21.000000000 +0100
@@ -19,7 +19,7 @@ else
 ARCH_LIB=
 fi
 
-export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
+export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/usr/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
 
 
 #cd $PR/c_common
diff -pruN CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_gk-ol CASA-1.6.659/shsrc/lshsrc/mk-micasa_gk-ol
--- CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_gk-ol	2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/shsrc/lshsrc/mk-micasa_gk-ol	2007-02-05 14:19:21.000000000 +0100
@@ -19,7 +19,7 @@ else
 ARCH_LIB=
 fi
 
-export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
+export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/usr/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
 
 cd $PR/c_adlib/ad_gk/native
 (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="`pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0` -O2 -fmessage-length=0 -Wall  -fstack-protector" $2 $3 $4 $5)