Author: coolo Date: Mon Dec 24 16:59:52 2007 New Revision: 43233 URL: http://svn.opensuse.org/viewcvs/yast?rev=43233&view=rev Log: don't duplicate all files between the two themes. Rather only package what's different and create symlinks for the rest. The main reason I do this is because the package solver has a problem if two packages are pretending to be the same, but have different qualities Removed: trunk/theme/openSUSE-Crystal/control-center/ trunk/theme/openSUSE-Crystal/desktops/ trunk/theme/openSUSE-Crystal/icons/22x22/apps/linux-user-mgmt.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/pattern-gnome.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/pattern-gnome.svg trunk/theme/openSUSE-Crystal/icons/22x22/apps/pattern-kde.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/pattern-kde.svg trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-certify.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-create-new-vm.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-default-group.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-desktop-select.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-files.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-fingerprint.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-ftp-server.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-general.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-ipsec.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-isns.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-kiwi.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-language.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-ldap-browser.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-live-install.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-product-registration.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-provider.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-remotechooser.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-remoteinstall.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-repair.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-report.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-scripts.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-sshd.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-sudo.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-vm-install.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-vm-management.png trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast-you_server.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/linux-user-mgmt.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/pattern-gnome.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/pattern-gnome.svg trunk/theme/openSUSE-Crystal/icons/32x32/apps/pattern-kde.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/pattern-kde.svg trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-certify.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-create-new-vm.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-default-group.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-desktop-select.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-files.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-fingerprint.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-ftp-server.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-general.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-inst-mode.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-ipsec.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-isns.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-kiwi.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-language.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-live-install.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-partitioning.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-provider.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-remotechooser.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-remoteinstall.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-repair.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-report.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-scripts.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-sshd.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-sudo.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-vm-install.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-vm-management.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-xen-dirinstall.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast-you_server.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/linux-user-mgmt.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-certify.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-create-new-vm.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-default-group.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-desktop-select.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-files.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-fingerprint.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-ftp-server.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-general.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-gnome.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-inst-mode.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-ipsec.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-isns.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-kde.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-kiwi.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-language.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-ldap-browser.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-live-install.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-partitioning.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-product-registration.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-provider.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-remotechooser.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-remoteinstall.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-repair.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-report.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-scripts.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-sshd.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-sudo.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-vm-install.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-vm-management.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-xen-dirinstall.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast-you_server.png trunk/theme/openSUSE-Crystal/testpage/ trunk/theme/openSUSE-Crystal/wallpapers/ trunk/theme/openSUSE-Crystal/wizard/ Modified: trunk/theme/ (props changed) trunk/theme/openSUSE-Crystal/Makefile.am trunk/theme/openSUSE/animations/ (props changed) trunk/theme/openSUSE/desktops/ (props changed) trunk/theme/openSUSE/wallpapers/ (props changed) trunk/theme/openSUSE/worldmap/ (props changed) trunk/theme/yast2-theme.spec.in Modified: trunk/theme/openSUSE-Crystal/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/Makefile.am?rev=43233&r1=43232&r2=43233&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/Makefile.am Mon Dec 24 16:59:52 2007 @@ -2,7 +2,7 @@ # Makefile.am for theme/openSUSE-Crystal # -SUBDIRS = wizard control-center icons testpage wallpapers desktops +SUBDIRS = icons themedir = @themedir@/openSUSE-Crystal Modified: trunk/theme/yast2-theme.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/yast2-theme.spec.in?rev=43233&r1=43232&r2=43233&view=diff ============================================================================== --- trunk/theme/yast2-theme.spec.in (original) +++ trunk/theme/yast2-theme.spec.in Mon Dec 24 16:59:52 2007 @@ -24,12 +24,8 @@ Version: @VERSION@ Group: System/YaST Provides: yast2_theme = %{version} -Provides: yast2-theme-UnitedLinux -PreReq: /bin/ln -Requires: hicolor-icon-theme -Obsoletes: yast2-theme-SuSELinux -Obsoletes: yast2-theme-UnitedLinux -Conflicts: yast2-theme-openSUSE +PreReq: /bin/ln yast2-theme-openSUSE +Requires: yast2-theme-openSUSE %description openSUSE - @@ -61,16 +57,28 @@ icons=$(ls *.png) cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/$dir/apps for icon in $icons; do - ln -s ../../../../YaST2/theme/current/icons/$dir/apps/$icon . + ln -s @themedir@/theme/current/icons/$dir/apps/$icon . done done +filelist=$(mktemp /tmp/fileListXXXXXX) +cd $RPM_BUILD_ROOT/@themedir@/openSUSE +files=$(find . -type f) +cd $RPM_BUILD_ROOT/@themedir@/openSUSE-Crystal +for file in $files; do + mkdir $(dirname "$file") + if ! test -f "$file"; then + ln -s $RPM_BUILD_ROOT/@themedir@/openSUSE/$file $file + fi +done @CLEAN@ rm -rf $RPM_BUILD_ROOT/@themedir@ %post openSUSE cd @themedir@ -ln -snf openSUSE current +if ! test -d openSUSE-Crystal; then + ln -snf openSUSE current +fi %post openSUSE-Crystal cd @themedir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org