From a23abdd88fda393474db164eebe24f0d11a1ecd8 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Mon, 25 Sep 2023 17:03:08 +0800
Subject: [PATCH] update ukwm.spec

(cherry picked from commit 9672b2641e6af6c8d51d4132f1c6db95c66cf830)
---
 ukwm.spec | 54 ++++++++++++++++++++----------------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/ukwm.spec b/ukwm.spec
index 61ff7f0..27c3290 100644
--- a/ukwm.spec
+++ b/ukwm.spec
@@ -1,6 +1,6 @@
 Name:           ukwm
 Version:        1.2.1
-Release:        6
+Release:        7
 Summary:        lightweight GTK+ window manager
 License:        LGPL-2.0-or-later and GPL-2.0-or-later and MIT
 URL:            http://www.ukui.org
@@ -158,33 +158,18 @@ Ukwm is a small window manager, using GTK+ and Clutter to do
 %patch0 -p1
 %patch1 -p1
 %build
-./autogen.sh
+%define gettext_version %(dnf info gettext |grep Version |awk '{print $3}'| awk -F "." 'BEGIN {OFS = FS} {print $1,$2}')
+sed -i 's/GETTEXT_MACRO_VERSION = .*/GETTEXT_MACRO_VERSION = %{gettext_version}/g' po/Makefile.in.in
 
-%define gettext_version %(dnf info gettext |grep Version |awk '{print $3}'| awk -F "." 'BEGIN {OFS = FS} {print $1,$2}'| grep awk 'NR==1')
-sed -i "/GETTEXT_MACRO_VERSION/s/0.19/%{gettext_version}/g" po/Makefile.in.in
+./autogen.sh --prefix=/usr --libdir=/usr/lib64
 
-make
+%{make_build}
 
 %install
 rm -rf $RPM_BUILD_ROOT 
-#make INSTALL_ROOT=/root/rpmbuild/BUILDROOT install
-make DESTDIR=$RPM_BUILD_ROOT install
-
-cp -rf %{buildroot}/usr/local/bin  %{buildroot}/usr/bin
-rm -rf %{buildroot}/usr/local/bin
-
-cp -rf %{buildroot}/usr/local/share  %{buildroot}/usr/share
-rm -rf %{buildroot}/usr/local/share
-
-cp -rf %{buildroot}/usr/local/include  %{buildroot}/usr/include
-rm -rf %{buildroot}/usr/local/include
-
-
-mkdir -p %{buildroot}/usr/lib/ukwm
-cp -rf %{buildroot}/usr/local/libexec/ukwm-restart-helper  %{buildroot}/usr/lib/ukwm/ukwm-restart-helper
-rm -rf %{buildroot}/usr/local/libexec
-chrpath -d %{buildroot}/usr/bin/ukwm
+%{make_install} DESTDIR=%{buildroot}
 
+#chrpath -d %{buildroot}/usr/bin/ukwm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -201,14 +186,14 @@ update-alternatives --install /usr/bin/x-window-manager \
         
 %files 
 %{_bindir}/*
-%{_prefix}/lib//ukwm/ukwm-restart-helper
-%{_prefix}/local/lib/ukwm/plugins/
+%{_libexecdir}/ukwm-restart-helper
+%{_libdir}/ukwm/plugins/
 %{_datadir}/applications/
 %{_datadir}/ukui/plugin/org.ukui.ukwm.UkwmPlugin.xml
 
 %files -n libukwm-1-0
-%{_prefix}/local/lib/libukwm-1.so.*
-%{_prefix}/local/lib/ukwm/*.so
+%{_libdir}/libukwm-1.so*
+%{_libdir}/ukwm/*.so
 
 %files common
 %doc debian/copyright debian/changelog
@@ -219,19 +204,20 @@ update-alternatives --install /usr/bin/x-window-manager \
 %{_datadir}/gnome-control-center
 
 %files -n libukwm-1-dev
-%{_prefix}/include
-%{_prefix}/local/lib/lib*.so
-%{_prefix}/local/lib/pkgconfig/*.pc
-%{_prefix}/local/lib/ukwm/*.gir
+%{_includedir}/
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/ukwm/*.gir
 
 %files -n gir1.2-ukwm-1
-%{_prefix}/local/lib/ukwm/*.typelib
+%{_libdir}/ukwm/*.typelib
 
-%exclude %{_prefix}/local/lib/libukwm-1.la
-%exclude %{_prefix}/local/lib/ukwm/*.la
-%exclude %{_datadir}/ukui
+%exclude %{_libdir}/libukwm-1.la
+%exclude %{_libdir}/ukwm/*.la
 
 %changelog
+* Mon Sep 25 2023 peijiankang <peijiankang@kylinos.cn> - 1.2.1-7
+- update ukwm.spec
+
 * Wed Mar 01 2023 tanyulong <tanyulong@kylinos.cn> - 1.2.1-6
 - remove rpath of ukwm