Skip to content

B
branding-etersoft-ximper
Commit 7acb2417 authored by Sergey V Turchin's avatar Sergey V Turchin
Browse files
Options

Merge remote-tracking branch 'boyarsh/centaurus' into kdesktop

Conflicts: branding.spec
parents ea904bf2 9db7a718
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 172 deletions
Makefile.in
View file @ 7acb2417
......@@ -15,4 +15,4 @@ all:
mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
include components.mk
install: browser-qt ahttpd boot indexhtml
install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml
branding.spec
View file @ 7acb2417
......@@ -4,7 +4,6 @@
%define Brand ALT Linux
%define variants altlinux-desktop altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
Name: branding-%brand-kdesktop
Version: 6.0.0
Release: alt10
......@@ -18,8 +17,11 @@ BuildArch: noarch
%define status БЕТА
%define status_en BETA
BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid
BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-droid
BuildRequires: design-bootloader-source >= 5.0-alt2
%ifnarch %arm
BuildRequires: cpio gfxboot >= 4
%endif
BuildRequires(pre): libqt4-core
BuildRequires: libalternatives-devel
......@@ -36,6 +38,7 @@ License: GPL
%description
Distro-specific packages with design and texts
%package bootloader
Group: System/Configuration/Boot and Init
Summary: Graphical boot logo for grub2, lilo and syslinux
......@@ -53,6 +56,7 @@ Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme desig
Here you find the graphical boot logo. Suitable for both lilo and syslinux.
%package bootsplash
BuildArch: noarch
Summary: Theme for splash animations during bootup
License: Distributable
Group: System/Configuration/Boot and Init
......@@ -65,6 +69,7 @@ This package contains graphics for boot process, displayed via Plymouth
%package alterator
BuildArch: noarch
Summary: Design for alterator for %Brand %Theme
License: GPL
Group: System/Configuration/Other
......@@ -80,6 +85,7 @@ PreReq(post,preun): alternatives >= 0.2 alterator
Design for QT and web alterator for %Brand %Theme
%package graphics
BuildArch: noarch
Summary: design for ALT
License: Different licenses
Group: Graphics
......@@ -96,10 +102,12 @@ This package contains some graphics for ALT design.
%define provide_list altlinux fedora redhat system altlinux
%define obsolete_list altlinux-release fedora-release redhat-release
%define conflicts_list altlinux-release-sisyphus altlinux-release-4.0 altlinux-release-junior altlinux-release-master altlinux-release-server altlinux-release-terminal altlinux-release-small_business
%package release
BuildArch: noarch
Summary: %distribution %Theme release file
Copyright: GPL
License: GPL
Group: System/Configuration/Other
Provides: %(for n in %provide_list; do echo -n "$n-release = %version-%release "; done) altlinux-release-%theme branding-alt-%theme-release
Obsoletes: %obsolete_list branding-alt-%theme-release
......@@ -110,6 +118,7 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi
%distribution %version %Theme release file.
%package notes
BuildArch: noarch
Provides: alt-license-theme = %version alt-notes-%theme
Obsoletes: alt-license-%theme alt-notes-%theme
Summary: Distribution license and release notes
......@@ -122,7 +131,7 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi
Distribution license and release notes
%package kde4-settings
BuildArch: noarch
Summary: KDE4 settings for %Brand %version %Theme
License: Distributable
Group: Graphical desktop/KDE
......@@ -134,6 +143,7 @@ KDE4 settings for %Brand %version %Theme
%package kde3-settings
BuildArch: noarch
Summary: KDE3 settings for %Brand %version %Theme
License: Distributable
Group: Graphical desktop/KDE
......@@ -146,6 +156,7 @@ KDE3 settings for %Brand %version %Theme
%package fvwm-settings
BuildArch: noarch
Summary: FVWM2 settings for %Brand %version %Theme
License: Distributable
Group: Graphical desktop/FVWM based
......@@ -157,6 +168,7 @@ FVWM2 settings for %Brand %version %Theme
%package gnome-settings
BuildArch: noarch
Summary: GNOME settings for %Brand %version %Theme
License: Distributable
Group: Graphical desktop/GNOME
......@@ -165,7 +177,7 @@ Requires: gtk2-theme-mist
Provides: gnome-theme-%brand-%theme = %version-%release
Provides: metacity-theme-%brand-%theme = %version-%release
Provides: metacity-theme
#Provides: gnome-menus
Provides: gnome-menus = 2.30.4
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-gnome-settings ";done )
%description gnome-settings
......@@ -174,6 +186,7 @@ GNOME settings for %Brand %version %Theme
%package slideshow
BuildArch: noarch
Summary: Slideshow for %Brand %version %Theme installer
License: Distributable
Group: System/Configuration/Other
......@@ -184,6 +197,7 @@ Slideshow for %Brand %version %Theme installer
%package indexhtml
BuildArch: noarch
Summary: %name -- ALT Linux html welcome page
License: distributable
Group: System/Base
......@@ -207,10 +221,15 @@ ALT Linux index.html welcome page.
%prep
%setup -n branding
%ifnarch %arm
%define x86 boot
%else
%define x86 %nil
%endif
%build
autoconf
THEME=%theme NAME='%Theme' BRAND_FNAME='%Brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version ./configure
THEME=%theme NAME='%Theme' BRAND_FNAME='%Brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version X86='%x86' ./configure
make
%install
......@@ -251,10 +270,6 @@ popd
pushd kde4-settings
mkdir -p %buildroot%_sysconfdir/skel/.kde4
cp -a kde4/* %buildroot%_sysconfdir/skel/.kde4/
mkdir -p %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
install -m 644 menu/*menu %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
mkdir -p %buildroot/usr/share/desktop-directories/
install -m 644 menu/*directory %buildroot/usr/share/desktop-directories/
popd
#kde3-settings
......@@ -289,9 +304,8 @@ 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 gnome-applications.menu '%buildroot/etc/xdg/menus/'
install -m 644 settings.menu '%buildroot/etc/xdg/menus/'
cp -a skel/.gconf '%buildroot/etc/skel/'
popd
......@@ -326,10 +340,12 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
%post indexhtml
%_sbindir/indexhtml-update
%ifnarch %arm
%files bootloader
%_datadir/gfxboot/%theme
/boot/splash/%theme
/boot/grub/themes/%theme
%endif
#bootsplash
%post bootsplash
......@@ -364,20 +380,19 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
%files kde4-settings
%_sysconfdir/skel/.kde4
%_sysconfdir/kde4/xdg/menus/applications-merged/*
/usr/share/desktop-directories/*
%ifnarch %arm
%files kde3-settings
%_sysconfdir/skel/.kde
%_datadir/apps/ksplash/Themes/*
%endif
%files fvwm-settings
%_sysconfdir/skel/.fvwm2rc
%files gnome-settings
%_datadir/themes/*
/etc/gnome/xdg/menus/applications-merged/
#/etc/xdg/menus/*
/etc/gnome/xdg/menus
/etc/skel/.gconf
%files slideshow
......@@ -393,6 +408,13 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
%_desktopdir/indexhtml.desktop
%changelog
* Wed Apr 27 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt6
- settings menu translation fixed
* Tue Apr 26 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt5
- arm buildabulity
- gnome menus customization
* Tue Apr 12 2011 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt10
- update groups and steps icons
......
components.mk
View file @ 7acb2417
......@@ -23,7 +23,7 @@ ahttpd:
# bootloader and bootsplash
boot:
boot-images:
cp -a /usr/src/design-bootloader-source ./
cp -a components/bootloader/config design-bootloader-source/
cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-install/
......@@ -34,12 +34,14 @@ boot:
cp -al boot-800x600.jpg design-bootloader-source/data-boot/back.jpg
convert images/boot.png -resize "800x600!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' design-bootloader-source/data-install/back.jpg
#bootsplash
boot-splash: boot-images
mkdir -p $(datadir)/plymouth/themes/$(THEME)
cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
cp -al images/background*x*.png $(datadir)/plymouth/themes/$(THEME)/
cp -a components/bootsplash/* $(datadir)/plymouth/themes/$(THEME)
mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth
#bootloader
boot: boot-images
DEFAULT_LANG='--lang-to-subst--' PATH=$(PATH):/usr/sbin make -C design-bootloader-source
install -d -m 755 $(sysconfdir)/../boot/splash/$(THEME)
install -d -m 755 $(datadir)/gfxboot/$(THEME)
......
configure.ac
View file @ 7acb2417
......@@ -37,6 +37,7 @@ AC_SUBST(MIDDLE_COLOR_DEC)
AC_SUBST(DARK_COLOR_DEC)
AC_SUBST(TITLE_COLOR)
AC_SUBST(INACTIVE_COLOR)
AC_SUBST(X86)
AC_CONFIG_FILES([
Makefile
......
gnome-settings/applications.menu deleted 100644 → 0
View file @ ea904bf2
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu>
<Name>Applications</Name>
<Directory>X-GNOME-Menu-Applications.directory</Directory>
<!-- Scan legacy dirs first, as later items take priority -->
<!-- <KDELegacyDirs/> -->
<LegacyDir>/etc/X11/applnk</LegacyDir>
<LegacyDir>/usr/share/gnome/apps</LegacyDir>
<!-- Read standard .directory and .desktop file locations -->
<!-- <DefaultAppDirs/> -->
<!-- <DefaultDirectoryDirs/> -->
<!-- Read in overrides and child menus from applications-merged/ -->
<!-- <DefaultMergeDirs/> -->
<!-- Accessories submenu -->
<Menu>
<Name>Accessories</Name>
<Directory>Utility.directory</Directory>
<Include>
<And>
<Category>Utility</Category>
<!-- Accessibility spec must have either the Utility or Settings
category, and we display an accessibility submenu already for
the ones that do not have Settings, so don't display accessibility
applications here -->
<Not><Category>Accessibility</Category></Not>
<Not><Category>System</Category></Not>
</And>
</Include>
</Menu> <!-- End Accessories -->
<!-- Accessibility submenu -->
<Menu>
<Name>Universal Access</Name>
<Directory>Utility-Accessibility.directory</Directory>
<Include>
<And>
<Category>Accessibility</Category>
<Not><Category>Settings</Category></Not>
</And>
</Include>
</Menu> <!-- End Accessibility -->
<!-- Development Tools -->
<Menu>
<Name>Development</Name>
<Directory>Development.directory</Directory>
<Include>
<And>
<Category>Development</Category>
</And>
<Filename>emacs.desktop</Filename>
</Include>
</Menu> <!-- End Development Tools -->
<!-- Education -->
<Menu>
<Name>Education</Name>
<Directory>Education.directory</Directory>
<Include>
<And>
<Category>Education</Category>
</And>
</Include>
</Menu> <!-- End Education -->
<!-- Games -->
<Menu>
<Name>Games</Name>
<Directory>Game.directory</Directory>
<Include>
<And>
<Category>Game</Category>
</And>
</Include>
</Menu> <!-- End Games -->
<!-- Graphics -->
<Menu>
<Name>Graphics</Name>
<Directory>Graphics.directory</Directory>
<Include>
<And>
<Category>Graphics</Category>
</And>
</Include>
</Menu> <!-- End Graphics -->
<!-- Internet -->
<Menu>
<Name>Internet</Name>
<Directory>Network.directory</Directory>
<Include>
<And>
<Category>Network</Category>
</And>
</Include>
</Menu> <!-- End Internet -->
<!-- Multimedia -->
<Menu>
<Name>Multimedia</Name>
<Directory>AudioVideo.directory</Directory>
<Include>
<And>
<Category>AudioVideo</Category>
</And>
</Include>
</Menu> <!-- End Multimedia -->
<!-- Office -->
<Menu>
<Name>Office</Name>
<Directory>Office.directory</Directory>
<Include>
<And>
<Category>Office</Category>
</And>
</Include>
</Menu> <!-- End Office -->
<!-- System Tools-->
<Menu>
<Name>System</Name>
<Directory>System-Tools.directory</Directory>
<Include>
<And>
<Category>System</Category>
<Not><Category>Settings</Category></Not>
</And>
</Include>
</Menu> <!-- End System Tools -->
<!-- Other -->
<Menu>
<Name>Other</Name>
<Directory>X-GNOME-Other.directory</Directory>
<OnlyUnallocated/>
<Include>
<And>
<Not><Category>Core</Category></Not>
<Not><Category>Settings</Category></Not>
<Not><Category>Screensaver</Category></Not>
</And>
</Include>
</Menu> <!-- End Other -->
</Menu> <!-- End Applications -->
gnome-settings/gnome-applications.menu 0 → 100644
View file @ 7acb2417
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
<Menu>
<MergeFile>altlinux-applications.menu</MergeFile>
<Name>Applications</Name>
<Menu>
<Name>Multimedia</Name>
<Exclude>
<Filename>adobe_flash_player_eula.desktop</Filename>
</Exclude>
</Menu>
<Menu>
<Name>Internet</Name>
<Exclude>
<Filename>lftp.desktop</Filename>
</Exclude>
</Menu>
<Menu>
<Name>Development</Name>
<Exclude>
<Filename>gdb.desktop</Filename>
</Exclude>
</Menu>
</Menu>
gnome-settings/settings.menu
View file @ 7acb2417
......@@ -10,6 +10,8 @@
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
<DirectoryDir>/usr/share/desktop-directories/gnome</DirectoryDir>
<!-- Read in overrides and child menus from applications-merged/ -->
<DefaultMergeDirs/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment