diff --git a/papirus-icon-theme-20200301.tar.gz b/papirus-icon-theme-20230901.tar.gz similarity index 55% rename from papirus-icon-theme-20200301.tar.gz rename to papirus-icon-theme-20230901.tar.gz index 57f9754..a9e40d6 100644 Binary files a/papirus-icon-theme-20200301.tar.gz and b/papirus-icon-theme-20230901.tar.gz differ diff --git a/papirus-icon-theme.spec b/papirus-icon-theme.spec index c56fc04..238d514 100644 --- a/papirus-icon-theme.spec +++ b/papirus-icon-theme.spec @@ -1,6 +1,6 @@ Name: papirus-icon-theme -Version: 20200301 -Release: 3 +Version: 20230901 +Release: 1 Summary: Free and open source SVG icon theme based on Paper Icon Set # Some icons are based on Paper Icon Theme, CC-BY-SA @@ -34,55 +34,28 @@ Papirus icon theme is available in six variants: %install %make_install -export THEMES="ePapirus Papirus Papirus-Adapta Papirus-Adapta-Nokto Papirus-Dark Papirus-Light" +export THEMES="ePapirus ePapirus-Dark Papirus Papirus-Dark Papirus-Light" for t in $THEMES; do - mkdir -p %{buildroot}%{_datadir}/icons/$t /bin/touch %{buildroot}%{_datadir}/icons/$t/icon-theme.cache done -# Handle folder to link upgrade -# Remove in F33 -%pretrans -p --- Define the path to directory being replaced below. --- DO NOT add a trailing slash at the end. -pathlist = {"%{_datadir}/icons/Papirus-Light/16x16/actions", - "%{_datadir}/icons/Papirus-Light/16x16/devices", - "%{_datadir}/icons/Papirus-Light/16x16/places", - "%{_datadir}/icons/Papirus-Light/22x22/actions", - "%{_datadir}/icons/Papirus-Light/24x24/actions"} -for key,path in ipairs(pathlist) -do - st = posix.stat(path) - if st and st.type == "directory" then - status = os.rename(path, path .. ".rpmmoved") - if not status then - suffix = 0 - while not status do - suffix = suffix + 1 - status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix) - end - os.rename(path, path .. ".rpmmoved") - end - end -end - %post -export THEMES="ePapirus Papirus Papirus-Adapta Papirus-Adapta-Nokto Papirus-Dark Papirus-Light" +export THEMES="ePapirus ePapirus-Dark Papirus Papirus-Dark Papirus-Light" for t in $THEMES; do /bin/touch --no-create %{_datadir}/icons/$t &>/dev/null || : done %postun -export THEMES="ePapirus Papirus Papirus-Adapta Papirus-Adapta-Nokto Papirus-Dark Papirus-Light" -for t in $THEMES; do - if [ $1 -eq 0 ] ; then +if [ $1 -eq 0 ] ; then + export THEMES="ePapirus ePapirus-Dark Papirus Papirus-Dark Papirus-Light" + for t in $THEMES; do /bin/touch --no-create %{_datadir}/icons/$t &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/$t &>/dev/null || : - fi -done + done +fi %posttrans -export THEMES="ePapirus Papirus Papirus-Adapta Papirus-Adapta-Nokto Papirus-Dark Papirus-Light" +export THEMES="ePapirus ePapirus-Dark Papirus Papirus-Dark Papirus-Light" for t in $THEMES; do /usr/bin/gtk-update-icon-cache %{_datadir}/icons/$t &>/dev/null || : done @@ -90,27 +63,26 @@ done %files %license LICENSE %doc AUTHORS README.md -%{_datadir}/icons/ePapirus -%{_datadir}/icons/Papirus -%{_datadir}/icons/Papirus-Adapta -%{_datadir}/icons/Papirus-Adapta-Nokto -%{_datadir}/icons/Papirus-Dark -%{_datadir}/icons/Papirus-Light +%{_datadir}/icons/Papirus-Dark/*x* +%{_datadir}/icons/Papirus-Dark/symbolic +%{_datadir}/icons/Papirus-Light/*x* +%{_datadir}/icons/Papirus-Light/symbolic +%{_datadir}/icons/Papirus/*x* +%{_datadir}/icons/Papirus/symbolic +%{_datadir}/icons/ePapirus-Dark/*x* +%{_datadir}/icons/ePapirus-Dark/symbolic +%{_datadir}/icons/ePapirus/*x* +%{_datadir}/icons/ePapirus/symbolic +%ghost %{_datadir}/icons/ePapirus-Dark/icon-theme.cache %ghost %{_datadir}/icons/ePapirus/icon-theme.cache %ghost %{_datadir}/icons/Papirus/icon-theme.cache -%ghost %{_datadir}/icons/Papirus-Adapta/icon-theme.cache -%ghost %{_datadir}/icons/Papirus-Adapta-Nokto/icon-theme.cache %ghost %{_datadir}/icons/Papirus-Dark/icon-theme.cache %ghost %{_datadir}/icons/Papirus-Light/icon-theme.cache -# Handle folder to link upgrade -# Remove in F33 -%ghost %{_datadir}/icons/Papirus-Light/16x16/actions.rpmmoved -%ghost %{_datadir}/icons/Papirus-Light/16x16/devices.rpmmoved -%ghost %{_datadir}/icons/Papirus-Light/16x16/places.rpmmoved -%ghost %{_datadir}/icons/Papirus-Light/22x22/actions.rpmmoved -%ghost %{_datadir}/icons/Papirus-Light/24x24/actions.rpmmoved %changelog +* Tue Oct 17 2023 yaoxin - 20230901-1 +- Upgrade to 20230901 + * Fri Jul 15 2022 yaoxin - 20200301-3 - License compliance rectification