5.0.0-alt20

branding.spec

@@ -6,7 +6,7 @@
 
 Name: branding-%brand-%theme
 Version: 5.0.0
-Release: alt19
+Release: alt20
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@@ -19,8 +19,8 @@ BuildRequires: libqt4-devel
 BuildRequires: ImageMagick fontconfig bc libGConf-devel
 
 %define Theme Master 
-%define status ПРОТОТИП
-%define status_en Prototype
+%define status  beta
+%define status_en beta
 %define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench altlinux-desktop altlinux-gnome-desktop
 
 
@@ -142,35 +142,6 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi
 %description kde3-settings
 KDE3 settings for %Brand %version %Theme
 
-%package gnome-settings
-
-Summary: GNOME settings for %Brand %version %Theme
-License: Distributable
-Group: Graphical desktop/GNOME
-Requires: altlinux-menus
-Requires: gtk2-theme-mist
-Provides: gnome-theme-%brand-%theme = %version-%release
-Provides: metacity-theme-%brand-%theme = %version-%release
-Provides: metacity-theme
-#Provides: gnome-menus
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-gnome-settings ";done )
-
-%description gnome-settings
-GNOME settings for %Brand %version %Theme
-
-%package xfce-settings
-
-Summary: XFCE settings for %Brand %version %Theme
-License: Distributable
-Group: Graphical desktop/XFce
-Requires: PolicyKit-gnome
-Obsoletes: xfce-settings-lite xfce-settings-school-lite
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-xfce-settings ";done )
-
-%description xfce-settings
-XFCE settings for %Brand %version %Theme
-
-
 %package slideshow
 
 Summary: Slideshow for %Brand %version %Theme installer
@@ -271,22 +242,6 @@ install -m 644 *.png "%buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/"
 install -m 644 *.rc "%buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/"
 popd
 
-#gnome-settings
-%define XdgThemeName %Brand %Theme
-pushd gnome-settings
-mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName'
-mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
-install -m 644 gtkrc '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
-mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1'
-install -m 644 metacity-theme-1.xml '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1/'
-install -m 644 index.theme '%buildroot/%_datadir/themes/%XdgThemeName/'
-mkdir -p '%buildroot/etc/gnome/xdg/menus/applications-merged/'
-install -m 644 applications.menu '%buildroot/etc/gnome/xdg/menus/applications-merged/'
-mkdir -p '%buildroot/etc/xdg/menus/'
-install -m 644 settings.menu '%buildroot/etc/xdg/menus/'
-cp -a skel/.gconf  '%buildroot/etc/skel/'
-popd
-
 #slideshow
 mkdir -p %buildroot/usr/share/install2/slideshow
 install slideshow/*  %buildroot/usr/share/install2/slideshow/
@@ -302,36 +257,6 @@ touch %buildroot%_indexhtmldir/index.html
 install -m644 indexhtml.desktop %buildroot%_desktopdir/
 popd
 
-#xfce-settings
-pushd xfce-settings
-mkdir -p %buildroot/etc/skel/.config/xfce4/desktop
-mkdir -p %buildroot/etc/skel/.config/xfce4/mcs_settings
-mkdir -p %buildroot/etc/skel/.config/xfce4/panel
-mkdir -p %buildroot/etc/skel/.config/xfce4-session
-mkdir -p %buildroot/etc/skel/.config/autostart
-mkdir -p %buildroot/etc/skel/.local/share/applications
-mkdir -p %buildroot/etc/skel/Templates
-install -m 644 etcskel/Templates/* %buildroot/etc/skel/Templates/
-install -m 644 etcskel/.config/xfce4/helpers.rc %buildroot/etc/skel/.config/xfce4/
-install -m 644 etcskel/.config/xfce4/desktop/* %buildroot/etc/skel/.config/xfce4/desktop
-install -m 644 etcskel/.config/xfce4/mcs_settings/* %buildroot/etc/skel/.config/xfce4/mcs_settings
-install -m 644 etcskel/.config/xfce4/panel/* %buildroot/etc/skel/.config/xfce4/panel
-install -m 644 etcskel/.config/xfce4-session/* %buildroot/etc/skel/.config/xfce4-session/
-install -m 644 etcskel/.config/autostart/*  %buildroot/etc/skel/.config/autostart
-install -m 644 etcskel/.local/share/applications/*  %buildroot/etc/skel/.local/share/applications
-install -m 644 etcskel/.wm-select %buildroot/etc/skel/
-install -m 644 etcskel/.Xdefaults %buildroot/etc/skel/
-
-mkdir -p  %buildroot/usr/share/xfce4/backdrops
-install -m 644 backgrounds/* %buildroot/usr/share/xfce4/backdrops
-mkdir -p  '%buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0'
-install -m 644 themes/ALTLinux/gtk-2.0/* '%buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0/'
-install -m 644 themes/ALTLinux/*.png '%buildroot/usr/share/themes/ALTLinux-%Theme/'
-
-mkdir -p %buildroot/%_bindir
-install -m 644 bin/* %buildroot/%_bindir
-popd
-
 #bootloader
 %pre bootloader
 [ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
@@ -398,12 +323,6 @@ echo $lang > lang
 %_sysconfdir/skel/.kde
 %_datadir/apps/ksplash/Themes/*
 
-%files gnome-settings
-%_datadir/themes/*
-#/etc/gnome/xdg/menus/applications-merged/
-#/etc/xdg/menus/*
-/etc/skel/.gconf
-
 %files slideshow
 /usr/share/install2/slideshow
 
@@ -412,20 +331,11 @@ echo $lang > lang
 %_indexhtmldir/*
 %_desktopdir/*
 
-%files xfce-settings
-/etc/skel/Templates
-%exclude /etc/skel/Templates/*
-/etc/skel/.wm-select
-/etc/skel/.Xdefaults
-/etc/skel/.config
-/etc/skel/.config
-/etc/skel/.local
-/usr/share/themes/*
-/usr/share/xfce4/backdrops
-%_bindir/*
-
 
 %changelog
+* Mon Aug 17 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt20
+- new images and colors
+
 * Fri Aug 14 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt19
 - menu customizaton (first try)