From e7aa6a5dac0871f23fc382dd4b485a2cdcec69d4 Mon Sep 17 00:00:00 2001
From: zhuchunyi <zhuchunyi@huawei.com>
Date: Wed, 6 Nov 2019 19:32:37 +0800
Subject: [PATCH] update code

---
 gtk2.spec | 59 +++++++++++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/gtk2.spec b/gtk2.spec
index 39102ed..50b26fa 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -1,8 +1,8 @@
 #Global macro or variable
 %global __provides_exclude_from ^%{_libdir}/gtk-2.0
-%define bin_version 2.10.0
+%define gtk_bin_version 2.10.0
 
-#Basic Information，
+#Basic Information
 Name:    gtk2
 Version: 2.24.32
 Release: 3
@@ -119,14 +119,9 @@ echo ".so man1/gtk-query-immodules-2.0.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gtk-q
 mkdir -p tmpdocs
 cp -aR docs/tutorial/html tmpdocs/tutorial
 cp -aR docs/faq/html tmpdocs/faq
-
-for dir in examples/* ; do
-  if [ -d $dir ] ; then
-     mkdir -p tmpdocs/$dir
-     for file in $dir/* ; do
-       install -m 0644 $file tmpdocs/$dir
-     done
-  fi
+mkdir -p tmpdocs/examples
+for dir in $(find examples/* -type d); do
+    cp -aR $dir tmpdocs/examples
 done
 
 mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64
@@ -138,20 +133,20 @@ cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
 # rm unpackaged files
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/*/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_bin_version}/*/*.la
 rm $RPM_BUILD_ROOT%{_bindir}/gtk-update-icon-cache
 rm $RPM_BUILD_ROOT%{_mandir}/man1/gtk-update-icon-cache.1*
 
-touch $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/immodules.cache
+touch $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules.cache
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/filesystems
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_bin_version}/filesystems
 
-%transfiletriggerin -- %{_libdir}/gtk-2.0/immodules/ %{_libdir}/gtk-2.0/%{bin_version}/immodules/
+%transfiletriggerin -- %{_libdir}/gtk-2.0/immodules/ %{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/
 gtk-query-immodules-2.0-64 --update-cache
 
-%transfiletriggerpostun -- %{_libdir}/gtk-2.0/immodules/ %{_libdir}/gtk-2.0/%{bin_version}/immodules/
+%transfiletriggerpostun -- %{_libdir}/gtk-2.0/immodules/ %{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/
 gtk-query-immodules-2.0-64 --update-cache
 
 #Install and uninstall scripts
@@ -173,36 +168,36 @@ gtk-query-immodules-2.0-64 --update-cache
 %{_libdir}/libgailutil.so.*
 %{_libdir}/girepository-1.0
 %dir %{_libdir}/gtk-2.0
-%dir %{_libdir}/gtk-2.0/%{bin_version}
-%{_libdir}/gtk-2.0/%{bin_version}/engines
-%{_libdir}/gtk-2.0/%{bin_version}/filesystems
-%dir %{_libdir}/gtk-2.0/%{bin_version}/immodules
-%{_libdir}/gtk-2.0/%{bin_version}/printbackends
+%dir %{_libdir}/gtk-2.0/%{gtk_bin_version}
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/engines
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/filesystems
+%dir %{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/printbackends
 %{_libdir}/gtk-2.0/modules
 %{_libdir}/gtk-2.0/immodules
-%ghost %{_libdir}/gtk-2.0/%{bin_version}/immodules.cache
+%ghost %{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules.cache
 %dir %{_datadir}/gtk-2.0
 %{_datadir}/themes/Default
 %{_datadir}/themes/Emacs
 %{_datadir}/themes/Raleigh
 
 %files immodules
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-am-et.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-cedilla.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-cyrillic-translit.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-inuktitut.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ipa.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-multipress.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-thai.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-er.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-et.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-viqr.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-am-et.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-cedilla.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-cyrillic-translit.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-inuktitut.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-ipa.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-multipress.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-thai.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-ti-er.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-ti-et.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-viqr.so
 %{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
 %dir %{_sysconfdir}/gtk-2.0
 %config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf
 
 %files immodule-xim
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-xim.so
+%{_libdir}/gtk-2.0/%{gtk_bin_version}/immodules/im-xim.so
 
 %files devel -f gtk20-properties.lang
 %{_libdir}/lib*.so