diff --git a/deepin-icon-theme-2020.06.28.orig.tar.xz b/deepin-icon-theme-2020.06.28.orig.tar.xz deleted file mode 100644 index badbb0f..0000000 Binary files a/deepin-icon-theme-2020.06.28.orig.tar.xz and /dev/null differ diff --git a/deepin-icon-theme-2021.11.18.tar.gz b/deepin-icon-theme-2021.11.18.tar.gz new file mode 100644 index 0000000..9259d42 Binary files /dev/null and b/deepin-icon-theme-2021.11.18.tar.gz differ diff --git a/deepin-icon-theme.spec b/deepin-icon-theme.spec index 87ccf41..378ee81 100644 --- a/deepin-icon-theme.spec +++ b/deepin-icon-theme.spec @@ -1,10 +1,13 @@ +%global themes bloom bloom-dark bloom-classic bloom-classic-dark Sea +%global start_logo start-here + Name: deepin-icon-theme -Version: 2020.06.28 -Release: 1 +Version: 2021.11.18 +Release: 1%{?dist}.02 Summary: Icons for the Deepin Desktop Environment License: GPLv3 URL: https://github.com/linuxdeepin/deepin-icon-theme -Source0: %{name}-%{version}.orig.tar.xz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: gtk-update-icon-cache BuildRequires: xorg-x11-apps @@ -14,66 +17,60 @@ Conflicts: deepin-cursor-theme %description %{summary}. -%package -n sea-icon-theme -Summary: Deepin Sea Icons -Conflicts: deepin-icon-theme < 15.12.65 - -%description -n sea-icon-theme - Deepin Sea Icons - This package is DeepinIconTheme Sea - %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} +# no such theme +sed -i '/bloom-v20/d' Makefile %build -make +%make_build %install -sed -i -E '/bloom-v20/d' Makefile -mkdir -p %{buildroot}/usr/share/icons/bloom-classic -cp -r bloom-classic/* %{buildroot}/usr/share/icons/bloom-classic -mkdir -p %{buildroot}/usr/share/icons/bloom-classic-dark -cp -r bloom-classic-dark/* %{buildroot}/usr/share/icons/bloom-classic-dark -mkdir -p %{buildroot}/usr/share/icons/Sea -cp -r Sea/* %{buildroot}/usr/share/icons/Sea/ - -%{__make} install-icons DESTDIR=%{?buildroot} INSTALL="%{__install} -p" PREFIX=%{_prefix} -%{__make} install-cursors DESTDIR=%{?buildroot} INSTALL="%{__install} -p" PREFIX=%{_prefix} -%{__make} hicolor-links +make install-icons install-cursors DESTDIR=%{buildroot} PREFIX=%{_prefix} +cp -a ./Sea ./bloom-classic ./bloom-classic-dark ./usr/share/icons/hicolor %{buildroot}%{_datadir}/icons +for theme in %{themes}; do + for dir in %{buildroot}%{_datadir}/icons/$theme/places/*; do + size=$(basename $dir) + if [ -f %{_datadir}/icons/hicolor/${size}x${size}/places/%{start_logo}.png ]; then + ln -sf ../../../hicolor/${size}x${size}/places/%{start_logo}.png $dir + elif [ -f %{_datadir}/icons/hicolor/${size}/places/%{start_logo}.svg ]; then + ln -sf ../../../hicolor/${size}/places/%{start_logo}.svg $dir + fi + done + touch %{buildroot}%{_datadir}/icons/$theme/icon-theme.cache +done %post -touch --no-create %{_datadir}/icons/deepin &>/dev/null || : -touch --no-create %{_datadir}/icons/deepin-dark &>/dev/null || : -touch --no-create %{_datadir}/icons/Sea &>/dev/null || : +for theme in %{themes}; do + touch --no-create %{_datadir}/icons/$theme &>/dev/null || : +done %postun if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/deepin &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/deepin &>/dev/null || : - touch --no-create %{_datadir}/icons/deepin-dark &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/deepin-dark &>/dev/null || : - touch --no-create %{_datadir}/icons/Sea &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/Sea &>/dev/null || : + for theme in %{themes}; do + touch --no-create %{_datadir}/icons/$theme &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/$theme &>/dev/null || : + done fi %posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/deepin &>/dev/null || : -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/deepin-dark &>/dev/null || : -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/Sea &>/dev/null || : +for theme in %{themes}; do + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/$theme &>/dev/null || : +done %files %license LICENSE +%{_datadir}/icons/hicolor/*/status/*.svg +%{_datadir}/icons/hicolor/*/apps/*.svg +%{_datadir}/icons/bloom-dark/ %{_datadir}/icons/bloom/ %{_datadir}/icons/bloom-classic/ %{_datadir}/icons/bloom-classic-dark/ -%{_datadir}/icons/bloom-dark - - -%files -n sea-icon-theme -%license LICENSE %{_datadir}/icons/Sea/ - +%{_datadir}/icons/Vintage/ +%ghost %{_datadir}/icons/*/icon-theme.cache %changelog -* Thu Jul 30 2020 openEuler Buildteam - 2020.06.28-1 -- Package init +* Tue Jun 14 2022 uoser - 2021.11.18-1.02 +- update: update 2021.11.18-1.02 +