From 1e73dd799392d0c1408d141875a489cc40d1a1f2 Mon Sep 17 00:00:00 2001 From: "Cameron (Kamran) Mashayekhi" Date: Mon, 24 Apr 2006 16:07:03 +0000 Subject: [PATCH] yast2-project was updated renaming miCASA.* to NovellCasa.* to solve a load problem. --- casa-yast/agents/Makefile | 2 +- casa-yast/config.log | 26 ++++++++++++++----- casa-yast/config.status | 8 +++--- casa-yast/src/.dep | 5 ++++ casa-yast/src/Makefile | 4 +-- casa-yast/src/Makefile.am | 2 +- casa-yast/src/Makefile.in | 2 +- casa-yast/src/{miCASA.pm => NovellCasa.pm} | 0 casa-yast/src/{miCASA.ybc => NovellCasa.ybc} | Bin 5659 -> 5663 bytes casa-yast/src/{miCASA.ycp => NovellCasa.ycp} | 0 casa-yast/yast2-CASA.changes | 6 +++++ casa-yast/yast2-CASA.spec.in | 4 +-- 12 files changed, 42 insertions(+), 17 deletions(-) rename casa-yast/src/{miCASA.pm => NovellCasa.pm} (100%) rename casa-yast/src/{miCASA.ybc => NovellCasa.ybc} (94%) rename casa-yast/src/{miCASA.ycp => NovellCasa.ycp} (100%) diff --git a/casa-yast/agents/Makefile b/casa-yast/agents/Makefile index a9718a1b..af97f91d 100644 --- a/casa-yast/agents/Makefile +++ b/casa-yast/agents/Makefile @@ -94,7 +94,7 @@ PACKAGE_STRING = yast2-CASA 1.6.462 PACKAGE_TARNAME = yast2-CASA PACKAGE_VERSION = 1.6.462 PATH_SEPARATOR = : -PKG_CONFIG_PATH = +PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig RPMNAME = yast2-CASA SET_MAKE = SHELL = /bin/sh diff --git a/casa-yast/config.log b/casa-yast/config.log index be44820a..4ed22a94 100644 --- a/casa-yast/config.log +++ b/casa-yast/config.log @@ -27,11 +27,25 @@ hostinfo = unknown /usr/bin/oslevel = unknown /bin/universe = unknown -PATH: /usr/sbin -PATH: /bin +PATH: . +PATH: /home/cameron/bin +PATH: /usr/local/bin PATH: /usr/bin PATH: /sbin PATH: /usr/X11R6/bin +PATH: /usr/sbin +PATH: /bin +PATH: /usr/games +PATH: /opt/gnome/bin +PATH: /opt/kde3/bin +PATH: /usr/lib/mit/bin +PATH: /usr/lib/mit/sbin +PATH: /usr/lib/qt3/bin +PATH: /usr/local/ccm63/bin +PATH: /opt/slickedit/bin +PATH: /usr/local/ccm63/bin +PATH: /opt/slickedit/bin +PATH: /usr/local/ccm63/bin ## ----------- ## @@ -49,7 +63,7 @@ configure:1455: result: /usr/bin/install -c configure:1466: checking whether build environment is sane configure:1509: result: yes configure:1561: checking for gawk -configure:1577: found /bin/gawk +configure:1577: found /usr/bin/gawk configure:1587: result: gawk configure:1597: checking whether make sets $(MAKE) configure:1617: result: yes @@ -107,8 +121,8 @@ config.status:703: creating src/Makefile ac_cv_build=x86_64-suse-linux ac_cv_build_alias=x86_64-suse-linux -ac_cv_env_PKG_CONFIG_PATH_set= -ac_cv_env_PKG_CONFIG_PATH_value= +ac_cv_env_PKG_CONFIG_PATH_set=set +ac_cv_env_PKG_CONFIG_PATH_value=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig ac_cv_env_build_alias_set= ac_cv_env_build_alias_value= ac_cv_env_host_alias_set= @@ -164,7 +178,7 @@ PACKAGE_STRING='yast2-CASA 1.6.462' PACKAGE_TARNAME='yast2-CASA' PACKAGE_VERSION='1.6.462' PATH_SEPARATOR=':' -PKG_CONFIG_PATH='' +PKG_CONFIG_PATH='/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig' RPMNAME='yast2-CASA' SET_MAKE='' SHELL='/bin/sh' diff --git a/casa-yast/config.status b/casa-yast/config.status index 3edbc365..758835bd 100755 --- a/casa-yast/config.status +++ b/casa-yast/config.status @@ -294,7 +294,7 @@ Report bugs to ." ac_cs_version="\ yast2-CASA config.status 1.6.462 configured by ./configure, generated by GNU Autoconf 2.59, - with options \"\" + with options \" 'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig'\" Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -373,8 +373,8 @@ if $ac_cs_silent; then fi if $ac_cs_recheck; then - echo "running /bin/sh ./configure " $ac_configure_extra_args " --no-create --no-recursion" >&6 - exec /bin/sh ./configure $ac_configure_extra_args --no-create --no-recursion + echo "running /bin/sh ./configure " 'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig' $ac_configure_extra_args " --no-create --no-recursion" >&6 + exec /bin/sh ./configure 'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig' $ac_configure_extra_args --no-create --no-recursion fi for ac_config_target in $ac_config_targets @@ -522,7 +522,7 @@ s,@agentdir@,${prefix}/lib/YaST2/servers_non_y2,;t t s,@desktopdir@,${prefix}/share/applications/YaST2,;t t s,@fillupdir@,/var/adm/fillup-templates,;t t s,@LN_S@,ln -s,;t t -s,@PKG_CONFIG_PATH@,,;t t +s,@PKG_CONFIG_PATH@,/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig,;t t s,@XGETTEXT@,/usr/bin/xgettext,;t t s,@CREATE_PKGCONFIG_TRUE@,#,;t t s,@CREATE_PKGCONFIG_FALSE@,,;t t diff --git a/casa-yast/src/.dep b/casa-yast/src/.dep index 7c19a288..25cdb1f8 100644 --- a/casa-yast/src/.dep +++ b/casa-yast/src/.dep @@ -3,3 +3,8 @@ miCASA.ybc: \ /usr/share/YaST2/modules/Report.ybc \ /usr/share/YaST2/modules/Summary.ybc +NovellCasa.ybc: \ + /usr/share/YaST2/modules/Progress.ybc \ + /usr/share/YaST2/modules/Report.ybc \ + /usr/share/YaST2/modules/Summary.ybc + diff --git a/casa-yast/src/Makefile b/casa-yast/src/Makefile index 6165de3c..206d8772 100644 --- a/casa-yast/src/Makefile +++ b/casa-yast/src/Makefile @@ -105,7 +105,7 @@ PACKAGE_STRING = yast2-CASA 1.6.462 PACKAGE_TARNAME = yast2-CASA PACKAGE_VERSION = 1.6.462 PATH_SEPARATOR = : -PKG_CONFIG_PATH = +PKG_CONFIG_PATH = /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig RPMNAME = yast2-CASA SET_MAKE = SHELL = /bin/sh @@ -193,7 +193,7 @@ desktop_DATA = \ CASA.desktop module_DATA = \ - miCASA.ycp + NovellCasa.ycp icons_DATA = \ icons/install_casa_yast_icons diff --git a/casa-yast/src/Makefile.am b/casa-yast/src/Makefile.am index a296ea4e..ca263fa9 100644 --- a/casa-yast/src/Makefile.am +++ b/casa-yast/src/Makefile.am @@ -20,7 +20,7 @@ desktop_DATA = \ CASA.desktop module_DATA = \ - miCASA.ycp + NovellCasa.ycp icons_DATA = \ icons/install_casa_yast_icons diff --git a/casa-yast/src/Makefile.in b/casa-yast/src/Makefile.in index 7e0a9add..07aeb01f 100644 --- a/casa-yast/src/Makefile.in +++ b/casa-yast/src/Makefile.in @@ -193,7 +193,7 @@ desktop_DATA = \ CASA.desktop module_DATA = \ - miCASA.ycp + NovellCasa.ycp icons_DATA = \ icons/install_casa_yast_icons diff --git a/casa-yast/src/miCASA.pm b/casa-yast/src/NovellCasa.pm similarity index 100% rename from casa-yast/src/miCASA.pm rename to casa-yast/src/NovellCasa.pm diff --git a/casa-yast/src/miCASA.ybc b/casa-yast/src/NovellCasa.ybc similarity index 94% rename from casa-yast/src/miCASA.ybc rename to casa-yast/src/NovellCasa.ybc index 72a6a6a218f6a26d1c903d65e15de9381866c5be..82ec2548d6d1532150980482aff0e728ca992547 100644 GIT binary patch delta 25 gcmbQOGhb(dDIXsL1A||FS!zy>b7FDgM*BOW0AbY#Jpcdz delta 21 ccmbQQGh1hZDHj(514C}6vtzL1M&~=C06~rhKL7v# diff --git a/casa-yast/src/miCASA.ycp b/casa-yast/src/NovellCasa.ycp similarity index 100% rename from casa-yast/src/miCASA.ycp rename to casa-yast/src/NovellCasa.ycp diff --git a/casa-yast/yast2-CASA.changes b/casa-yast/yast2-CASA.changes index ebf4d5de..1ab9ea1a 100644 --- a/casa-yast/yast2-CASA.changes +++ b/casa-yast/yast2-CASA.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 24 09:55:20 MDT 2006 - cmashayekhi@novell.com + +- miCASA.ycp, miCASA.pm and miCASA.ybc were renamed to + NovellCasa.* to solve a load problem. + ------------------------------------------------------------------- Sat Apr 22 18:56:32 MDT 2006 - cmashayekhi@novell.com diff --git a/casa-yast/yast2-CASA.spec.in b/casa-yast/yast2-CASA.spec.in index 2d42845c..cf5423ea 100644 --- a/casa-yast/yast2-CASA.spec.in +++ b/casa-yast/yast2-CASA.spec.in @@ -23,7 +23,7 @@ Source0: %{name}-%{version}.tar.bz2 prefix: /usr -Requires: yast2 CASA >= 1.6.0 +Requires: yast2 CASA > 1.6.400 Summary: Configuration for Novell CASA (Common Authentication Services Adapter) @@ -68,6 +68,6 @@ exit 0 @yncludedir@/CASA/* @clientdir@/CASA.ycp @clientdir@/CASA_*.ycp -@moduledir@/miCASA.* +@moduledir@/NovellCasa.* @desktopdir@/CASA.desktop %doc @docdir@