diff --git a/yast2-CASA/SUBDIRS b/yast2-CASA/SUBDIRS index 048a5d61..e0fbe533 100644 --- a/yast2-CASA/SUBDIRS +++ b/yast2-CASA/SUBDIRS @@ -1 +1 @@ -agents src pofiles +agents src diff --git a/yast2-CASA/make_casa_yast.sh b/yast2-CASA/make_casa_yast.sh index 9e3f0573..d63cdd51 100755 --- a/yast2-CASA/make_casa_yast.sh +++ b/yast2-CASA/make_casa_yast.sh @@ -957,7 +957,7 @@ rpmBuild () executeMakePotFile # create the CASA.po file - createPOFile + #createPOFile # delete the yast2-CASA directory in the SOURCES directory # deleteSourcesDirectoryContents @@ -1091,7 +1091,7 @@ createTarBall () cleanMOFiles # create the *.mo files - createMOFiles + #createMOFiles # create the log directory createLogDirectory @@ -1110,7 +1110,7 @@ createTarBall () executeMakePackageLocal # create the CASA.po file - executeMakePotFile + #executeMakePotFile # create the tar directory and the spec directory createTarDirectory diff --git a/yast2-CASA/yast2-CASA.changes b/yast2-CASA/yast2-CASA.changes index a3a341ce..3e72dff8 100644 --- a/yast2-CASA/yast2-CASA.changes +++ b/yast2-CASA/yast2-CASA.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 10 15:53:12 MDT 2007 - schoi@novell.com + +- BUG 299044 remove mo and po files to fix the conflict between yast2-CASA and yast2-trans-en_US + ------------------------------------------------------------------- Tue Jul 31 13:09:13 MDT 2007 - schoi@novell.com diff --git a/yast2-CASA/yast2-CASA.spec.in b/yast2-CASA/yast2-CASA.spec.in index c7b73a31..ac279ffc 100644 --- a/yast2-CASA/yast2-CASA.spec.in +++ b/yast2-CASA/yast2-CASA.spec.in @@ -70,7 +70,6 @@ exit 0 /usr/share/pixmaps/CASA_22.png /usr/share/pixmaps/CASA_32.png /usr/share/pixmaps/CASA_48.png -/usr/share/YaST2/locale/* @yncludedir@/CASA/* @clientdir@/CASA.ycp @clientdir@/CASA_*.ycp