Author: locilka Date: Tue Jul 3 16:05:48 2007 New Revision: 39139 URL: http://svn.opensuse.org/viewcvs/yast?rev=39139&view=rev Log: - Created identical copy of yast2-theme-openSUSE under the name yast2-theme-openSUSE-Crystal (FATE #301304). The old theme will use Tango and the new one Crystal iconsets. Added: trunk/theme/openSUSE-Crystal/ - copied from r39103, trunk/theme/openSUSE/ Modified: trunk/theme/openSUSE-Crystal/Makefile.am trunk/theme/openSUSE-Crystal/control-center/Makefile.am trunk/theme/openSUSE-Crystal/desktops/Makefile.am trunk/theme/openSUSE-Crystal/icons/22x22/Makefile.am trunk/theme/openSUSE-Crystal/icons/22x22/apps/Makefile.am trunk/theme/openSUSE-Crystal/icons/32x32/Makefile.am trunk/theme/openSUSE-Crystal/icons/32x32/apps/Makefile.am trunk/theme/openSUSE-Crystal/icons/48x48/apps/Makefile.am trunk/theme/openSUSE-Crystal/icons/Makefile.am trunk/theme/openSUSE-Crystal/testpage/Makefile.am trunk/theme/openSUSE-Crystal/wallpapers/Makefile.am trunk/theme/openSUSE-Crystal/wizard/Makefile.am trunk/theme/package/yast2-theme.changes 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=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,10 +1,10 @@ # -# Makefile.am for theme/openSUSE +# Makefile.am for theme/openSUSE-Crystal # SUBDIRS = wizard control-center icons testpage wallpapers desktops -themedir = @themedir@/openSUSE +themedir = @themedir@/openSUSE-Crystal theme_DATA = $(wildcard *.png ) Modified: trunk/theme/openSUSE-Crystal/control-center/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/control-center/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/control-center/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/control-center/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,8 +1,8 @@ # -# Makefile.am for theme/openSUSE/control-center +# Makefile.am for theme/openSUSE-Crystal/control-center # -imgdir = @themedir@/openSUSE/control-center +imgdir = @themedir@/openSUSE-Crystal/control-center img_DATA = $(wildcard *.png ) Modified: trunk/theme/openSUSE-Crystal/desktops/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/desktops/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/desktops/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/desktops/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,8 +1,8 @@ # -# Makefile.am for theme/openSUSE +# Makefile.am for theme/openSUSE-Crystal/desktop # -testpagedir = @themedir@/openSUSE/desktops +testpagedir = @themedir@/openSUSE-Crystal/desktops testpage_DATA = \ yast-kde.png \ Modified: trunk/theme/openSUSE-Crystal/icons/22x22/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/22x22/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/icons/22x22/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/icons/22x22/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,5 +1,5 @@ # -# Makefile.am for theme/openSUSE/icons/22x22 +# Makefile.am for theme/openSUSE-Crystal/icons/22x22 # SUBDIRS = apps Modified: trunk/theme/openSUSE-Crystal/icons/22x22/apps/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/22x22/apps/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/icons/22x22/apps/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/icons/22x22/apps/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,8 +1,8 @@ # -# Makefile.am for theme/openSUSE/icons/22x22/apps +# Makefile.am for theme/openSUSE-Crystal/icons/22x22/apps # -icondir = @themedir@/openSUSE/icons/22x22/apps +icondir = @themedir@/openSUSE-Crystal/icons/22x22/apps icon_DATA = $(wildcard *.png ) Modified: trunk/theme/openSUSE-Crystal/icons/32x32/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/32x32/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/icons/32x32/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/icons/32x32/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,5 +1,5 @@ # -# Makefile.am for theme/openSUSE/icons/32x32 +# Makefile.am for theme/openSUSE-Crystal/icons/32x32 # SUBDIRS = apps Modified: trunk/theme/openSUSE-Crystal/icons/32x32/apps/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/32x32/apps/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/icons/32x32/apps/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/icons/32x32/apps/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,8 +1,8 @@ # -# Makefile.am for theme/openSUSE/icons/32x32/apps +# Makefile.am for theme/openSUSE-Crystal/icons/32x32/apps # -icondir = @themedir@/openSUSE/icons/32x32/apps +icondir = @themedir@/openSUSE-Crystal/icons/32x32/apps icon_DATA = $(wildcard *.png ) Modified: trunk/theme/openSUSE-Crystal/icons/48x48/apps/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/48x48/apps/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/icons/48x48/apps/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/icons/48x48/apps/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,8 +1,8 @@ # -# Makefile.am for theme/openSUSE/icons/48x48/apps +# Makefile.am for theme/openSUSE-Crystal/icons/48x48/apps # -icondir = @themedir@/openSUSE/icons/48x48/apps +icondir = @themedir@/openSUSE-Crystal/icons/48x48/apps icon_DATA = $(wildcard *.png ) Modified: trunk/theme/openSUSE-Crystal/icons/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/icons/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/icons/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,5 +1,5 @@ # -# Makefile.am for theme/openSUSE/icons +# Makefile.am for theme/openSUSE-Crystal/icons # SUBDIRS = 48x48 32x32 22x22 Modified: trunk/theme/openSUSE-Crystal/testpage/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/testpage/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/testpage/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/testpage/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,8 +1,8 @@ # -# Makefile.am for theme/openSUSE +# Makefile.am for theme/openSUSE-Crystal # -testpagedir = @themedir@/openSUSE/testpage +testpagedir = @themedir@/openSUSE-Crystal/testpage testpage_DATA = \ logo.eps \ Modified: trunk/theme/openSUSE-Crystal/wallpapers/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/wallpapers/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/wallpapers/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/wallpapers/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,8 +1,8 @@ # -# Makefile.am for theme/openSUSE/wallpapers +# Makefile.am for theme/openSUSE-Crystal/wallpapers # -wallpapersdir = @themedir@/openSUSE/wallpapers +wallpapersdir = @themedir@/openSUSE-Crystal/wallpapers wallpapers_DATA = $(wildcard *.png *.jpg ) Modified: trunk/theme/openSUSE-Crystal/wizard/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/wizard/Makefile.am?rev=39139&r1=39103&r2=39139&view=diff ============================================================================== --- trunk/theme/openSUSE-Crystal/wizard/Makefile.am (original) +++ trunk/theme/openSUSE-Crystal/wizard/Makefile.am Tue Jul 3 16:05:48 2007 @@ -1,8 +1,8 @@ # -# Makefile.am for theme/openSUSE/wizard +# Makefile.am for theme/openSUSE-Crystal/wizard # -wizarddir = @themedir@/openSUSE/wizard +wizarddir = @themedir@/openSUSE-Crystal/wizard wizard_DATA = $(wildcard *.png ) Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.changes?rev=39139&r1=39138&r2=39139&view=diff ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Tue Jul 3 16:05:48 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 3 15:57:47 CEST 2007 - locilka@suse.cz + +- Created identical copy of yast2-theme-openSUSE under the name + yast2-theme-openSUSE-Crystal (FATE #301304). The old theme will + use Tango and the new one Crystal iconsets. + +------------------------------------------------------------------- Wed Apr 18 16:46:47 CEST 2007 - juhliarik@suse.cz - Added ftp-server icons Modified: trunk/theme/yast2-theme.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/yast2-theme.spec.in?rev=39139&r1=39138&r2=39139&view=diff ============================================================================== --- trunk/theme/yast2-theme.spec.in (original) +++ trunk/theme/yast2-theme.spec.in Tue Jul 3 16:05:48 2007 @@ -1,25 +1,39 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: yast2-devtools pkg-config yast2-core yast2 update-desktop-files +BuildRequires: yast2-devtools pkg-config yast2-core yast2 update-desktop-files hicolor-icon-theme BuildArchitectures: noarch Summary: - %description - %package openSUSE +Summary: - +Version: @VERSION@ +Group: System/YaST +Provides: yast2_theme yast2-theme-UnitedLinux +PreReq: /bin/ln +Requires: hicolor-icon-theme +Obsoletes: yast2-theme-SuSELinux +Obsoletes: yast2-theme-UnitedLinux +Conflicts: yast2-theme-openSUSE-Crystal +%package openSUSE-Crystal Summary: - Version: @VERSION@ Group: System/YaST Provides: yast2_theme yast2-theme-UnitedLinux PreReq: /bin/ln +Requires: hicolor-icon-theme Obsoletes: yast2-theme-SuSELinux Obsoletes: yast2-theme-UnitedLinux +Conflicts: yast2-theme-openSUSE %description openSUSE - +%description openSUSE-Crystal +- @PREP@ @@ -27,45 +41,59 @@ @INSTALL@ cp -R "$RPM_BUILD_ROOT/@docdir@" "$RPM_BUILD_ROOT/@docdir@-openSUSE" +cp -R "$RPM_BUILD_ROOT/@docdir@" "$RPM_BUILD_ROOT/@docdir@-openSUSE-Crystal" rm -rf "$RPM_BUILD_ROOT/@docdir@" +# ghost file (not packed in RPM but listed) +cd $RPM_BUILD_ROOT/@themedir@/ +rm -rf current +ln -sn openSUSE current # # make icons available to GNOME control center (hicolor theme) # (bug #166008) mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps -cd $RPM_BUILD_ROOT/@themedir@/openSUSE/icons +cd $RPM_BUILD_ROOT/@themedir@/current/icons for dir in 22x22 32x32 48x48; do - cd $RPM_BUILD_ROOT/@themedir@/openSUSE/icons/$dir/apps + cd $RPM_BUILD_ROOT/@themedir@/current/icons/$dir/apps icons=$(ls *.png) cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/$dir/apps for icon in $icons; do - ln -s ../../../../YaST2/theme/openSUSE/icons/$dir/apps/$icon . + ln -s ../../../../YaST2/theme/current/icons/$dir/apps/$icon . done done - @CLEAN@ +rm -rf $RPM_BUILD_ROOT/@themedir@ %post openSUSE cd @themedir@ ln -snf openSUSE current +%post openSUSE-Crystal +cd @themedir@ +ln -snf openSUSE-Crystal current + %files openSUSE %defattr(-,root,root) %dir @themedir@ -%dir @themedir@/openSUSE -%dir /usr/share/icons/hicolor -%dir /usr/share/icons/hicolor/22x22 -%dir /usr/share/icons/hicolor/22x22/apps -%dir /usr/share/icons/hicolor/32x32 -%dir /usr/share/icons/hicolor/32x32/apps -%dir /usr/share/icons/hicolor/48x48 -%dir /usr/share/icons/hicolor/48x48/apps -@themedir@/openSUSE/* +@themedir@/openSUSE /usr/share/icons/hicolor/22x22/apps/* /usr/share/icons/hicolor/32x32/apps/* /usr/share/icons/hicolor/48x48/apps/* -@themedir@/openSUSE/testpage/* %doc @docdir@-openSUSE +# ghost file (not packed in RPM but listed) +# remove the file when removing the RPM +%ghost @themedir@/current +%files openSUSE-Crystal +%defattr(-,root,root) +%dir @themedir@ +@themedir@/openSUSE-Crystal +/usr/share/icons/hicolor/22x22/apps/* +/usr/share/icons/hicolor/32x32/apps/* +/usr/share/icons/hicolor/48x48/apps/* +%doc @docdir@-openSUSE-Crystal +# ghost file (not packed in RPM but listed) +# remove the file when removing the RPM +%ghost @themedir@/current -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org