0.9.3-eter1

branding.spec

@@ -19,8 +19,8 @@
 %define _unpackaged_files_terminate_build 1
 
 Name: branding-%flavour
-Version: 0.9.2
-Release: alt6
+Version: 0.9.3
+Release: eter1
 Url: https://ximperlinux.ru
 
 %ifarch %ix86 x86_64
@@ -49,16 +49,6 @@ Distro-specific packages for %distro_name.
 %description -l ru_RU.UTF-8
 Пакеты для дистрибутива %distro_name_ru.
 
-%package apt-conf
-BuildArch: noarch
-Summary: A set of apt configuration files for %distro_name
-License: GPL-2.0-or-later
-Group: System/Configuration/Packaging
-
-%branding_add_conflicts %flavour apt-conf
-%description apt-conf
-This package contains default apt configuration for %distro_name.
-
 %package bootloader
 Group:   System/Configuration/Boot and Init
 Summary: Graphical boot logo for grub2, lilo and syslinux
@@ -278,11 +268,6 @@ find %buildroot -name \*.in -delete
 
 mkdir -p %buildroot/%_datadir/install3
 
-#apt-conf
-mkdir -p %buildroot%_sysconfdir/apt/sources.list.d
-install ximper.list %buildroot%_sysconfdir/apt/sources.list.d/ximper.list
-
-
 mkdir -p %buildroot/%_datadir/glib-2.0/schemas
 install gnome-settings-gschema/ximper-linux-gnome.gschema.override %buildroot%_datadir/glib-2.0/schemas/ximper-linux-gnome.gschema.override
 install gnome-settings-gschema/ximper-linux-base.gschema.override %buildroot%_datadir/glib-2.0/schemas/ximper-linux-base.gschema.override
@@ -294,11 +279,14 @@ mkdir -p %buildroot%_sysconfdir/skel/.config/environment.d
 install  skel/skel/.config/environment.d/qt.conf %buildroot%_sysconfdir/skel/.config/environment.d/qt.conf
 
 #hyprland settings
-for i in hypr kitty swaync waybar wofi wlogout nwg-dock-hyprland; do
+for i in hypr kitty swaync waybar wofi wlogout; do
 mkdir -p %buildroot%_sysconfdir/skel/.config/$i
 cp -r skel/skel/.config/$i %buildroot%_sysconfdir/skel/.config/
 done
 
+mkdir -p %buildroot%_sysconfdir/ximperdistro/hyprland
+cp -r configs/hyprland %buildroot%_sysconfdir/ximperdistro/
+
 install pixmaps/ximperlinux.svg %buildroot%_pixmapsdir/ximperlinux.svg
 
 #backgrounds
@@ -341,9 +329,6 @@ if ! [ -e %_datadir/alt-notes/license.all.html ]; then
 	cp -a %data_cur_dir/alt-notes/license.*.html %_datadir/alt-notes/
 fi
 
-%files apt-conf
-%config(noreplace) %_sysconfdir/apt/sources.list.d/ximper.list
-
 %files alterator
 %config %_altdir/*.rcc
 /usr/share/alterator-browser-qt/design/*.rcc
@@ -389,7 +374,7 @@ fi
 %_sysconfdir/skel/.config/waybar
 %_sysconfdir/skel/.config/wofi
 %_sysconfdir/skel/.config/wlogout
-%_sysconfdir/skel/.config/nwg-dock-hyprland
+%_sysconfdir/ximperdistro/hyprland
 
 %files slideshow
 /etc/alterator/slideshow.conf
@@ -406,6 +391,11 @@ fi
 #_iconsdir/hicolor/*/apps/alt-%theme-desktop.png
 
 %changelog
+* Sun Dec 01 2024 Kirill Unitsaev <fiersik@altlinux.org> 0.9.3-eter1
+- add base-settings package
+- add hyprland-settings package
+- drop apt-conf package
+
 * Mon Sep 23 2024 Kirill Unitsaev <fiersik@altlinux.org> 0.9.2-alt6
 - drop outdated code (ALT bug 51347)