Fix for to the startup service problem on upgrade.

Fix for circular dependency between CASA and Gnome Keyring.
Fix for yast grey out button.
This commit is contained in:
Cameron (Kamran) Mashayekhi
2006-05-22 21:14:34 +00:00
parent a601b19764
commit 0e2f327e7c
22 changed files with 339 additions and 190 deletions

View File

@@ -73,7 +73,7 @@ CREATE_PKGCONFIG_NOARCH_FALSE =
CREATE_PKGCONFIG_NOARCH_TRUE = #
CREATE_PKGCONFIG_TRUE = #
CYGPATH_W = echo
DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.515\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.515\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.515\"
DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.0\"
ECHO_C =
ECHO_N = -n
ECHO_T =
@@ -88,11 +88,11 @@ LTLIBOBJS =
MAINTAINER = casa <casa@novell.com>
MAKEINFO = ${SHELL} /home/cameron/dev/subversion/trunk/casa-yast/missing --run makeinfo
PACKAGE = yast2-CASA
PACKAGE_BUGREPORT = http://www.suse.de/feedback
PACKAGE_BUGREPORT = http://bugs.opensuse.org/
PACKAGE_NAME = yast2-CASA
PACKAGE_STRING = yast2-CASA 1.6.515
PACKAGE_STRING = yast2-CASA 1.6.0
PACKAGE_TARNAME = yast2-CASA
PACKAGE_VERSION = 1.6.515
PACKAGE_VERSION = 1.6.0
PATH_SEPARATOR = :
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
@@ -104,7 +104,7 @@ STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl
STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl
STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl
STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl
VERSION = 1.6.515
VERSION = 1.6.0
XGETTEXT = /usr/bin/xgettext
YCPC = /usr/bin/ycpc
YCPDOC = /usr/lib/YaST2/bin/ycpdoc