geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed to not allow icons to be installed by the yast packages. Also

Browse Source 
adjusted the CASA.desktop file to reflect then name under which its
icons were added to openSUSE.
This commit is contained in:
Juan Carlos Luciani
2008-05-30 22:05:27 +00:00
parent 437f17d0a2
commit c524288e22
5 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CASA-auth-token/yast2-casa-ats/src/Makefile.am
View File

@@ -2,9 +2,9 @@
yncludedir = @yncludedir@/casa-ats yncludedir = @yncludedir@/casa-ats
theme22dir = @themedir@/NLD/icons/22x22/apps #theme22dir = @themedir@/NLD/icons/22x22/apps
theme32dir = @themedir@/NLD/icons/32x32/apps #theme32dir = @themedir@/NLD/icons/32x32/apps
theme48dir = @themedir@/NLD/icons/48x48/apps #theme48dir = @themedir@/NLD/icons/48x48/apps
client_DATA = \ client_DATA = \
casa-ats.ycp casa-ats.ycp
@@ -18,12 +18,12 @@ ynclude_DATA = \
desktop_DATA = \ desktop_DATA = \
casa-ats.desktop casa-ats.desktop
theme22_DATA = \ #theme22_DATA = \
icon/22x22/yast-casa-ats.png # icon/22x22/yast-casa-ats.png
theme32_DATA = \ #theme32_DATA = \
icon/32x32/yast-casa-ats.png # icon/32x32/yast-casa-ats.png
theme48_DATA = \ #theme48_DATA = \
icon/48x48/yast-casa-ats.png # icon/48x48/yast-casa-ats.png
module_DATA = \ module_DATA = \
CasaAts.ycp CasaAts.ycp
@@ -33,6 +33,7 @@ casa-ats:
ln -sf . $@ ln -sf . $@
ycpchook = casa-ats ycpchook = casa-ats
EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(theme48_DATA) $(theme32_DATA) $(theme22_DATA) #EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(theme48_DATA) $(theme32_DATA) $(theme22_DATA)
EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA)
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common

5
CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in
View File

@@ -27,9 +27,4 @@ Summary: Configuration of casa-ats
@clientdir@/*.ycp @clientdir@/*.ycp
@moduledir@/CasaAts.* @moduledir@/CasaAts.*
@desktopdir@/casa-ats.desktop @desktopdir@/casa-ats.desktop
%if %suse_version < 1030
@themedir@/NLD/icons/22x22/apps/*.png
@themedir@/NLD/icons/32x32/apps/*.png
@themedir@/NLD/icons/48x48/apps/*.png
%endif
%doc @docdir@ %doc @docdir@

2
yast2-CASA/src/CASA.desktop
View File

@@ -16,7 +16,7 @@ X-SuSE-YaST-Geometry=
X-SuSE-YaST-SortKey= X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstResource=CASA X-SuSE-YaST-AutoInstResource=CASA
Icon=CASA Icon=yast-casa
Exec=/sbin/yast2 CASA Exec=/sbin/yast2 CASA
Name=CASA Name=CASA

19
yast2-CASA/src/Makefile.am
View File

@@ -1,8 +1,8 @@
# Makefile.am for CASA/src # Makefile.am for CASA/src
yncludedir = @yncludedir@/CASA yncludedir = @yncludedir@/CASA
iconsdir = /usr/share/applications #iconsdir = /usr/share/applications
themedir = /usr/share/pixmaps #themedir = /usr/share/pixmaps
client_DATA = \ client_DATA = \
@@ -22,14 +22,15 @@ desktop_DATA = \
module_DATA = \ module_DATA = \
NovellCasa.ycp NovellCasa.ycp
icons_DATA = \ #icons_DATA = \
icons/install_casa_yast_icons # icons/install_casa_yast_icons
theme_DATA = \ #theme_DATA = \
icons/CASA_22.png \ # icons/CASA_22.png \
icons/CASA_32.png \ # icons/CASA_32.png \
icons/CASA_48.png # icons/CASA_48.png
EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(icons_DATA) $(theme_DATA) #EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(icons_DATA) $(theme_DATA)
EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA)
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common

22
yast2-CASA/yast2-CASA.spec.in
View File

@@ -43,35 +43,13 @@ system installation.
@BUILD@ @BUILD@
@INSTALL@ @INSTALL@
chmod 555 $RPM_BUILD_ROOT/usr/share/applications/install_casa_yast_icons
@CLEAN@ @CLEAN@
%post
echo "yast2-CASA post install script"
echo "installing the Novell CASA YaST icon files"
/usr/share/applications/install_casa_yast_icons install rpm
exit 0
%preun
if [ "$1" = 0 ]; then
echo "yast2-CASA pre uninstall script"
echo "removing the Novell CASA YaST icon files"
/usr/share/applications/install_casa_yast_icons uninstall rpm
fi
exit 0
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%dir @yncludedir@/CASA %dir @yncludedir@/CASA
/usr/share/applications/install_casa_yast_icons /usr/share/applications/install_casa_yast_icons
%if %suse_version < 1030
/usr/share/pixmaps/CASA_22.png
/usr/share/pixmaps/CASA_32.png
/usr/share/pixmaps/CASA_48.png
%endif
@yncludedir@/CASA/* @yncludedir@/CASA/*
@clientdir@/CASA.ycp @clientdir@/CASA.ycp
@clientdir@/CASA_*.ycp @clientdir@/CASA_*.ycp