diff --git a/0001-del-some-config.patch b/0001-del-some-config.patch new file mode 100644 index 0000000000000000000000000000000000000000..62e61bc4383d826b951d9614ce2b54ce2e7c8972 --- /dev/null +++ b/0001-del-some-config.patch @@ -0,0 +1,28 @@ +From b6255811dc5537396e8d35c533267d16bf505002 Mon Sep 17 00:00:00 2001 +From: root +Date: Tue, 18 Jan 2022 18:30:11 +0800 +Subject: [PATCH] del some config + +--- + udev.rules.d/99-deepin.rules | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/udev.rules.d/99-deepin.rules b/udev.rules.d/99-deepin.rules +index 13ecd4a..8bf002b 100644 +--- a/udev.rules.d/99-deepin.rules ++++ b/udev.rules.d/99-deepin.rules +@@ -1,11 +1,2 @@ +-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline" +-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/iosched/slice_idle}="0" +-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/iosched/low_latency}="0" +-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/iosched/quantum}="32" +-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/iosched/slice_sync}="400" +-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/nr_requests}="4096" +-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/read_ahead_kb}="4096" +-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/iosched/back_seek_penalty}="16" +-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/max_sectors_kb}="%s{queue/max_hw_sectors_kb}" + # Disable Wlan power save + ACTION=="add", SUBSYSTEM=="net", KERNEL=="wlan*" RUN+="/sbin/iw dev %k set power_save off" +-- +2.27.0 + diff --git a/deepin-default-settings_2020.03.25.orig.tar.xz b/deepin-default-settings-2021.11.11.tar.gz similarity index 62% rename from deepin-default-settings_2020.03.25.orig.tar.xz rename to deepin-default-settings-2021.11.11.tar.gz index 15f7953b34dce463b7bbdeb479961e4951fb25fd..dc806db7d46fce28ff6427d5a3ab1ae4f7732b3e 100644 Binary files a/deepin-default-settings_2020.03.25.orig.tar.xz and b/deepin-default-settings-2021.11.11.tar.gz differ diff --git a/deepin-default-settings.spec b/deepin-default-settings.spec deleted file mode 100644 index e2d2a64bf58ce5a9cb41f33c282ffcdb65b7a294..0000000000000000000000000000000000000000 --- a/deepin-default-settings.spec +++ /dev/null @@ -1,89 +0,0 @@ -%bcond_with check -%global _unpackaged_files_terminate_build 0 -%global debug_package %{nil} -%global common_description %{expand:default settings for deepin destkop environment - This package does tweaking and to provide better experience of deepin desktop - environment.} - -Name: deepin-default-settings -Version: 2020.03.25 -Release: 3 -Summary: This library is designed to be exception-free and avoid Qt application developer do direct access to glib/glibmm -License: GPLv3 -URL: https://uos-packages.deepin.com/uos/pool/main/d/deepin-default-settings/ -Source0: https://uos-packages.deepin.com/uos/pool/main/d/%{name}/%{name}_%{version}.orig.tar.xz -BuildRequires: dde-desktop - -%description -%{common_description} - -%prep -%setup - -%build -make -%install -%make_install -install -d %{buildroot}%{_sysconfdir}/skel/{Desktop,Documents,Downloads,Pictures,Videos} -install -Dm644 %{_datadir}/applications/dde-computer.desktop %{buildroot}%{_sysconfdir}/skel/Desktop/dde-computer.desktop -install -Dm755 %{_datadir}/applications/dde-trash.desktop %{buildroot}%{_sysconfdir}/skel/Desktop/dde-trash.desktop - -%post -declare -a passwd_array -mapfile -t passwd_array <<<"$(getent passwd | grep -v nologin | grep -v halt | grep -v shutdown | grep -v sync)" -for i in "${passwd_array[@]}"; do - userid=$(echo "$i" | awk -F ':' '{print $3}') - groupid=$(echo "$i" | awk -F ':' '{print $4}') - userhome=$(echo "$i" | awk -F ':' '{print $6}') - if [ ! -f /"${userhome}"/Desktop/dde-computer.desktop ] && [ ! -f /"${userhome}"/Desktop/dde-trash.desktop ]; then - install -o "${userid}" -g "${groupid}" -Dm644 /etc/skel/.config/user-dirs.dirs /"${userhome}"/.config/user-dirs.dirs || true - install -o "${userid}" -g "${groupid}" -d /"${userhome}"/{Desktop,Documents,Downloads,Pictures,Pictures/Wallpapers,Music,Videos,.Public,.Templates} || true - install -o "${userid}" -g "${groupid}" -Dm644 /etc/skel/.config/autostart/dde-first-run.desktop /"${userhome}"/.config/autostart/dde-first-run.desktop || true - chown -R "${userid}":"${groupid}" "${userhome}" - fi -done - -%files -%{_sysconfdir}/apt -%{_sysconfdir}/X11/xorg.conf.d/50-synaptics.conf -%{_sysconfdir}/X11/xorg.conf.d/75-wacom.conf -%{_sysconfdir}/binfmt.d/wine.conf -%{_sysconfdir}/fonts/conf.d/10-enhance-rending.conf -%{_sysconfdir}/fonts/conf.d/55-language-deepin-zh-cn.conf -%{_sysconfdir}/fonts/conf.d/55-language-deepin-zh-hk.conf -%{_sysconfdir}/fonts/conf.d/55-language-deepin-zh-tw.conf -%{_sysconfdir}/gimp/2.0/fonts.conf -%{_sysconfdir}/lscolor-256color -%{_sysconfdir}/modprobe.d/iwlwifi.conf -%{_sysconfdir}/skel/.config/SogouPY/sogouEnv.ini -%{_sysconfdir}/skel/.config/Trolltech.conf -%{_sysconfdir}/skel/.config/autostart/dde-first-run.desktop -%{_sysconfdir}/skel/.config/deepin/qt-theme.ini -%{_sysconfdir}/skel/.config/user-dirs.dirs -%{_sysconfdir}/skel/.icons/default/index.theme -%{_sysconfdir}/skel/Music/bensound-sunny.mp3 -%{_sysconfdir}/skel/* -%{_sysconfdir}/sudoers.d/01_always_set_sudoers_home -/lib/udev/rules.d/99-deepin.rules -%{_bindir}/dde-first-run -/usr/lib/sysctl.d/deepin.conf -%{_datadir}/applications/deepin/dde-mimetype.list -%{_datadir}/deepin-default-settings/fontconfig.json -%{_datadir}/fontconfig/conf.avail/10-enhance-rending.conf -%{_datadir}/fontconfig/conf.avail/55-language-deepin-zh-cn.conf -%{_datadir}/fontconfig/conf.avail/55-language-deepin-zh-hk.conf -%{_datadir}/fontconfig/conf.avail/55-language-deepin-zh-tw.conf -%{_datadir}/mime/packages/deepin-workaround.xml -%{_datadir}/mime/wine-ini.xml -%{_datadir}/music/bensound-sunny.mp3 -%license LICENSE - -%changelog -* Wed Aug 03 2022 liweiganga -2020.03.25-3 -- Optimize post script - -* Wed Dec 16 2020 weidong - 2020.03.25-2 -- Update user desktop - -* Thu Sep 10 2020 chenbo pan - 2020.03.25-1 -- Project init. diff --git a/deepin-default-settings.yaml b/deepin-default-settings.yaml deleted file mode 100644 index 10ff3e238642d3ec6769176a374b4887dd4bde26..0000000000000000000000000000000000000000 --- a/deepin-default-settings.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: github -src_repo: linuxdeepin/deepin-default-settings -tag_prefix: ^ -seperator: . diff --git a/default-settings.spec b/default-settings.spec new file mode 100644 index 0000000000000000000000000000000000000000..ca3a79e9d82b628bf51e2c66c4d39e1963e8f9e9 --- /dev/null +++ b/default-settings.spec @@ -0,0 +1,122 @@ +Name: deepin-default-settings +Version: 2021.11.11 +Release: 1%{?dist}.02 +Summary: default settings for deepin destkop environment +License: GPLv3 +URL: https://github.com/linuxdeepin/default-settings +Source0: %{name}-%{version}.tar.gz +Patch1: 0001-del-some-config.patch +BuildArch: noarch +BuildRequires: dde-desktop +BuildRequires: deepin-wallpapers + +%description +default settings for deepin destkop environment. + +%package -n deepin-default-settings-tuning +Summary: default settings for deepin destkop environment +%description -n deepin-default-settings-tuning +This package includes files to override cups default page and fcitx icon. + +%prep +%if 0%{?openeuler} +%setup -q -n %{name}-%{version} +%else +%autosetup -n %{name}-%{version} -p1 +%endif + +%build +echo "build OK" + +%install +%make_install + +mkdir -p %{buildroot}/usr/share/deepin-default-settings/cups-filters/ +mkdir -p %{buildroot}/usr/share/deepin-default-settings/google-chrome/ +mkdir -p %{buildroot}/usr/share/deepin-default-settings/fcitx/ +mkdir -p %{buildroot}/etc/ +install -Dm644 tuning/cups-filters/*.pdf %{buildroot}/usr/share/deepin-default-settings/cups-filters/ +install -Dm644 tuning/google-chrome/*.tar %{buildroot}/usr/share/deepin-default-settings/google-chrome/ +install -Dm644 tuning/fcitx/*.png %{buildroot}/usr/share/deepin-default-settings/fcitx/ +cp -r skel %{buildroot}/etc/ + +install -d %{buildroot}%{_sysconfdir}/skel/{Desktop,Documents,Downloads,Pictures/Wallpapers,Music,Videos,.Public,.Templates} +install -d %{buildroot}%{_sysconfdir}/skel/.local/share/Trash +install -Dm644 %{_datadir}/applications/dde-computer.desktop %{buildroot}%{_sysconfdir}/skel/Desktop/dde-computer.desktop +install -Dm755 %{_datadir}/applications/dde-trash.desktop %{buildroot}%{_sysconfdir}/skel/Desktop/dde-trash.desktop +for file in `ls /usr/share/wallpapers/deepin/` +do + ln -svf /usr/share/wallpapers/deepin/$file %{buildroot}%{_sysconfdir}/skel/Pictures/Wallpapers/$file +done + +%post +## when root first login, init +if [ ! -f /root/Desktop/dde-computer.desktop ] && [ ! -f /root/Desktop/dde-trash.desktop ] ; then + install -Dm644 /etc/skel/.config/user-dirs.dirs /root/.config/user-dirs.dirs || true + install -d /root/{Desktop,Documents,Downloads,Pictures/Wallpapers,Music,Videos,.Public,.Templates} || true + install -Dm644 /etc/skel/.config/autostart/dde-first-run.desktop /root/.config/autostart/dde-first-run.desktop || true + install -m644 /etc/skel/Pictures/Wallpapers/*.jpg /root/Pictures/Wallpapers/ || true + install -m644 /etc/skel/Music/bensound-sunny.mp3 /root//Music/ || true +fi + +%post -n deepin-default-settings-tuning + +for i in 16 22 24 32 48 128 ;do + [ -f /usr/share/icons/hicolor/${i}x${i}/apps/fcitx.png ] && rm -f /usr/share/icons/hicolor/${i}x${i}/apps/fcitx.png +done +[ -f /usr/share/icons/hicolor/scalable/apps/fcitx.svg ] && rm -f /usr/share/icons/hicolor/scalable/apps/fcitx.svg +install -Dm644 /usr/share/deepin-default-settings/fcitx/fcitx.png /usr/share/icons/hicolor/16x16/apps/fcitx.png || true + +[ -f /usr/share/icons/hicolor/16x16/status/fcitx-kbd.png ] && rm -f /usr/share/icons/hicolor/16x16/status/fcitx-kbd.png +install -Dm644 /usr/share/deepin-default-settings/fcitx/fcitx.png /usr/share/icons/hicolor/16x16/status/fcitx-kbd.png || true + +rm -f /etc/apt/sources.list.d/google-chrome*.list +if [ -f /etc/opt/chrome/policies/recommended/defalut-plugins-settings.json ];then + rm -f /etc/opt/chrome/policies/recommended/defalut-plugins-settings.json +fi + +%files +%license LICENSE +## conflicts with file from package systemd +%exclude %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh +## conflicts with file from package shared-mime-info +%exclude %{_datadir}/applications/mimeapps.list +%{_sysconfdir}/X11/xorg.conf.d/*.conf +%{_sysconfdir}/binfmt.d/wine.conf +%{_sysconfdir}/fonts/conf.d/*.conf +%{_sysconfdir}/gimp/2.0/fonts.conf +%{_sysconfdir}/lscolor-256color +%{_sysconfdir}/modprobe.d/8821ce.conf +%{_sysconfdir}/modprobe.d/iwlwifi.conf +%{_sysconfdir}/skel/* +%{_sysconfdir}/skel/.config/SogouPY/sogouEnv.ini +%{_sysconfdir}/skel/.config/Trolltech.conf +%{_sysconfdir}/skel/.config/autostart/dde-first-run.desktop +%{_sysconfdir}/skel/.config/deepin/qt-theme.ini +%{_sysconfdir}/skel/.config/user-dirs.dirs +%{_sysconfdir}/skel/.icons/default/index.theme +%{_sysconfdir}/skel/Music/bensound-sunny.mp3 +%{_sysconfdir}/sudoers.d/01_always_set_sudoers_home +/lib/udev/rules.d/99-deepin.rules +%{_libexecdir}/dde-first-run +#服务器不需要桌面版调优参数 +%exclude %{_sysctldir}/deepin.conf +%{_datadir}/applications/deepin/dde-mimetype.list +%{_datadir}/deepin-default-settings/fontconfig.json +%{_datadir}/fontconfig/conf.avail/*.conf +%{_datadir}/mime/packages/deepin-workaround.xml +%{_datadir}/mime/wine-ini.xml +%{_datadir}/music/bensound-sunny.mp3 + +%files -n deepin-default-settings-tuning +%{_datadir}/deepin-default-settings/cups-filters/*.pdf +%{_datadir}/deepin-default-settings/google-chrome/*.tar +%{_datadir}/deepin-default-settings/fcitx/*.png + +%changelog +* Mon Jun 13 2022 uoser - 2021.11.11-1.02 +- update: rebuild + +* Tue Jan 18 2022 mahailiang - 2021.11.11-1.01 +- add patch: 0001-del-some-config.patch +- fix bug:https://pms.uniontech.com/zentao/bug-view-109522.html