added pre script to delete current/icons directory

yast · Nov 7, 2018 · d4289fa · d4289fa
1 parent 1ca1d8c
commit d4289fa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/package/yast2-theme.changes b/package/yast2-theme.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov  7 09:59:12 CET 2018 - schubi@suse.de
+
+- Update: removing {yast_themedir}/current/icons of older packages
+  at first of all (bsc12345)
+- 4.1.5
+
 -------------------------------------------------------------------
 Tue Oct 16 16:06:51 CEST 2018 - schubi@suse.de
 

diff --git a/package/yast2-theme.spec b/package/yast2-theme.spec
@@ -19,7 +19,7 @@
 
 
 Name:           yast2-theme
-Version:        4.1.4
+Version:        4.1.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -287,6 +287,15 @@ rm -rf $RPM_BUILD_ROOT/usr/share/icons/{crystal,oxygen}
 %fdupes $RPM_BUILD_ROOT%{yast_themedir}
 %fdupes $RPM_BUILD_ROOT/usr/share/icons
 
+# ../current/icons is a directory in older versions of yast2-branding-openSUSE.
+# While update via cpio this directory cannot be overwritten by a link with the same name
+# which is included in newer versions of yast2-branding-openSUSE. So we have to remove
+# this directory at first of all.
+%pre
+if test -d %{yast_themedir}/current/icons ; then
+  rm -rf %{yast_themedir}/current/icons
+fi
+
 %if 0%{?is_opensuse}
 
 %post -n yast2-branding-openSUSE-Oxygen