update spec

Makefile.in

@@ -95,7 +95,7 @@ boot-grub:
 boot: boot-splash boot-grub
 
 indexhtml:
-	#install -Dpm644 indexhtml/ximper-wiki.desktop $(datadir)/applications/ximper-wiki.desktop
+	install -Dpm644 indexhtml/ximper-wiki.desktop $(datadir)/applications/ximper-wiki.desktop
 
 install: browser-qt ahttpd boot indexhtml
 	# install product icon

branding.spec

@@ -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
@@ -276,11 +266,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
@@ -292,11 +277,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/
+cp -r configs/hyprland %buildroot%_sysconfdir/ximperdistro/
+
 install pixmaps/ximperlinux.svg %buildroot%_pixmapsdir/ximperlinux.svg
 
 #backgrounds
@@ -336,9 +324,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
@@ -384,7 +369,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