Skip to content

B
branding-etersoft-ximper
Commit 767dae02 authored by Andrey Cherepanov's avatar Andrey Cherepanov
Browse files
Options

8.2-alt0.M80P.1

- New release - Use pam-limits-desktop instead of own limits rules - Remove altlinux.ru from files
parent 175b8556
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 20 deletions
branding.spec
View file @ 767dae02
......@@ -5,7 +5,7 @@
%define codename Falco rusticolus
%define status %nil
%define status_en %nil
%define distro_name ALT Education 8.1%status_en
%define distro_name ALT Education 8.2%status_en
%define flavour %brand-%theme
%define design_graphics_abi_epoch 0
......@@ -14,7 +14,7 @@
%define design_graphics_abi_bugfix 0
Name: branding-%flavour
Version: 8.1
Version: 8.2
Release: alt0.M80P.1
BuildArch: noarch
......@@ -34,7 +34,7 @@ Group: Graphics
Summary: System/Base
License: GPLv2+
%define distro_name_ru Альт Образование 8.1%status
%define distro_name_ru Альт Образование 8.2%status
%description
Distro-specific packages with design and texts for %distro_name.
......@@ -135,6 +135,7 @@ 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
%branding_add_conflicts %flavour release
Requires: pam-limits-desktop
%description release
%distro_name release file.
......@@ -325,14 +326,6 @@ for n in fedora redhat system; do
done
install -pD -m644 components/systemd/os-release %buildroot%_sysconfdir/os-release
# limits
mkdir -p %buildroot%_sysconfdir/security/limits.d/
cat <<__EOF__ >%buildroot%_sysconfdir/security/limits.d/77-%name.conf
* soft nproc 3072
root soft nproc 1024
* hard nproc 4096
__EOF__
#notes
pushd notes
%makeinstall
......@@ -493,7 +486,6 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr
%files release
%_sysconfdir/*-release
%_sysconfdir/buildreqs/packages/ignore.d/*
%config(noreplace) %_sysconfdir/security/limits.d/77-%name.conf
%files notes
%_datadir/alt-notes/*
......@@ -549,6 +541,11 @@ subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-gr
#config %_localstatedir/ldm/.pam_environment
%changelog
* Fri May 12 2017 Andrey Cherepanov <cas@altlinux.org> 8.2-alt0.M80P.1
- New release
- Use pam-limits-desktop instead of own limits rules
- Remove altlinux.ru from files
* Fri Oct 21 2016 Andrey Cherepanov <cas@altlinux.org> 8.1-alt0.M80P.1
- Increase release number
......
components/indexhtml/index-en.html.in
View file @ 767dae02
......@@ -46,7 +46,7 @@
<ul>
<li><a href="documentation/index.html">User Manual</a></li>
<li><a href="http://docs.altlinux.org">Online Documentation</a></li>
<li><a href="http://books.altlinux.ru">Books</a></li>
<li><a href="http://books.altlinux.org">Books</a></li>
<li><a href="http://altlinux.org/">Wiki</a></li>
<li><a href="http://altlinux.org/FAQ">FAQ</a></li>
<li><a href="http://altlinux.org/Features">ALT Linux Features</a></li>
......@@ -56,7 +56,7 @@
<td width="33%" class="column" id="central-pane"> <!-- Second column: Company -->
<ul>
<li><a href="https://www.basealt.ru">Company Website</a></li>
<li><a href="http://support.altlinux.ru">Technical Support</a></li>
<li><a href="http://support.basealt.ru">Technical Support</a></li>
<li><a href="https://www.basealt.ru/products/">Products</a></li>
<li><a href="https://www.basealt.ru/about/contacts/">Contacts</a></li>
<li><a href="https://www.basealt.ru/go/download/">Download</a></li>
......@@ -91,7 +91,7 @@
<div id="footer">
<table border="0" width="100%">
<tr>
<td id="left_footer">&copy; 2016 Basealt Ltd. All rights reserved.</td>
<td id="left_footer">&copy; 2016-2017 Basealt Ltd. All rights reserved.</td>
<td id="right_footer">
Tel/fax: +7 (495) 123-4799<br>
75 Butyrskaya<br>
......
components/indexhtml/index-ru.html.in
View file @ 767dae02
......@@ -46,7 +46,7 @@
<ul>
<li><a href="documentation/index.html">Руководство пользователя</a></li>
<li><a href="http://docs.altlinux.org">Онлайновая документация</a></li>
<li><a href="http://books.altlinux.ru">Книги</a></li>
<li><a href="http://books.altlinux.org">Книги</a></li>
<li><a href="http://altlinux.org/">Wiki</a></li>
<li><a href="http://altlinux.org/FAQ">FAQ</a></li>
<li><a href="http://altlinux.org/Features">Особенности ALT Linux</a></li>
......@@ -56,7 +56,7 @@
<td width="33%" class="column" id="central-pane"> <!-- Second column: Company -->
<ul>
<li><a href="https://www.basealt.ru">Сайт компании</a></li>
<li><a href="http://support.altlinux.ru">Техническая поддержка</a></li>
<li><a href="http://support.basealt.ru">Техническая поддержка</a></li>
<li><a href="https://www.basealt.ru/products/">Продукты</a></li>
<li><a href="https://www.basealt.ru/about/contacts/">Контакты</a></li>
<li><a href="https://www.basealt.ru/go/download/">Загрузить</a></li>
......@@ -91,7 +91,7 @@
<div id="footer">
<table border="0" width="100%">
<tr>
<td id="left_footer">&copy; ООО «Базальт СПО», 2016. Все права защищены.</td>
<td id="left_footer">&copy; ООО «Базальт СПО», 2016-2017. Все права защищены.</td>
<td id="right_footer">
Телефон: +7 (495) 123-4799<br>
ул. Бутырская, д.75<br>
......
components/systemd/os-release.in
View file @ 767dae02
......@@ -5,5 +5,5 @@ VERSION_ID=@VERSION@
PRETTY_NAME="@PRODUCT_NAME@ (@CODENAME@)"
ANSI_COLOR="1;33"
CPE_NAME="cpe:/o:alt linux:school server:@VERSION@"
HOME_URL="http://altlinux.ru/"
HOME_URL="https://basealt.ru/"
BUG_REPORT_URL="https://bugs.altlinux.org/"
configure.ac
View file @ 767dae02
AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.org] )
INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
PROGRESS_COLOR=306ac4
......
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