0001-Bump-dependency-on-gsettings-desktop-schemas-3.31.0.patch

@@ -1,34 +0,0 @@
-From d657d6897f3eb37201aa1bf71c514672dd054863 Mon Sep 17 00:00:00 2001
-From: pei-jiankang <peijiankang@kylinos.cn>
-Date: Thu, 23 Dec 2021 20:06:59 +0800
-Subject: [PATCH]  Bump dependency on gsettings-desktop-schemas 3.31.0
-
----
- debian/control | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/debian/control b/debian/control
-index 2813849..78bce9d 100755
---- a/debian/control
-+++ b/debian/control
-@@ -64,7 +64,7 @@ Depends: ${shlibs:Depends},
-          ${misc:Depends},
-          ukwm-common (>= ${source:Version}),
-          ukui-settings-daemon,
--         gsettings-desktop-schemas (>= 3.21.4),
-+         gsettings-desktop-schemas (>= 3.31.0),
-          zenity
- Provides: x-window-manager
- Recommends: ukui-window-switch
-@@ -88,7 +88,7 @@ Multi-Arch: same
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${shlibs:Depends},
-          ${misc:Depends},
--         gsettings-desktop-schemas (>= 3.15.92),
-+         gsettings-desktop-schemas (>= 3.31.0),
-          ukwm-common (>= ${source:Version})
- Description: window manager library from the Ukwm window manager
-  Ukwm is a small window manager, using GTK+ and Clutter to do
--- 
-2.30.0
-

0002-update-copyright.patch

@@ -1,98 +0,0 @@
-From 6d8358f8ff42c7f6b88542cb5d953170ae7dcd53 Mon Sep 17 00:00:00 2001
-From: pei-jiankang <peijiankang@kylinos.cn>
-Date: Thu, 23 Dec 2021 20:28:00 +0800
-Subject: [PATCH] update copyright
-
----
- debian/changelog |  7 +++++--
- debian/copyright | 15 +++++----------
- 2 files changed, 10 insertions(+), 12 deletions(-)
-
-diff --git a/debian/changelog b/debian/changelog
-index 8bea70f..d771b53 100755
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,14 +1,17 @@
--ukwm (1.2.1-1) unstable; urgency=medium
-+ukwm (1.2.1-1) experimental; urgency=medium
- 
-   [ Debian Janitor ]
-   * Use secure URI in Homepage field.
-   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
-     Repository-Browse.
- 
-+  [ Marco Trevisan ]
-+  * debian/control: Bump dependency on gsettings-desktop-schemas 3.31.0.
-+
-   [ handsome_feng ]
-   * New upstream bugfix release.
- 
-- -- handsome_feng <jianfengli@ubuntukylin.com>  Thu, 24 Sep 2020 19:41:48 +0800
-+ -- handsome_feng <jianfengli@ubuntukylin.com>  Thu, 03 Jun 2021 00:12:05 +0800
- 
- ukwm (1.2.0-1) unstable; urgency=medium
- 
-diff --git a/debian/copyright b/debian/copyright
-index ca10d52..97fb8c8 100755
---- a/debian/copyright
-+++ b/debian/copyright
-@@ -12,11 +12,6 @@ License: GPL-2+
- Files: src/backends/meta-backend-private.h
-        src/backends/meta-cursor-renderer.c
-        src/backends/meta-cursor-renderer.h
--       src/backends/x11/meta-backend-x11.h
--       src/backends/x11/meta-input-settings-x11.c
--       src/backends/x11/meta-cursor-renderer-x11.c
--       src/backends/x11/meta-cursor-renderer-x11.h
--       src/backends/x11/meta-backend-x11.c
-        src/core/meta-accel-parse.h
-        src/meta/meta-backend.h
-        src/meta/meta-background-image.h
-@@ -205,7 +200,7 @@ License: GPL-2+
- 
- 
- Files: src/wayland/meta-wayland-dma-buf.c
--       src/wayland/meta-wayland-dma-buf.c
-+       src/wayland/meta-wayland-dma-buf.h
- Copyright:
-    Copyright (C) 2016 Red Hat Inc.
-    Copyright (C) 2017 Intel Corporation
-@@ -295,6 +290,7 @@ License: GPL-2+
- Files: src/backends/meta-input-settings.c
-        src/tests/test-runner.c
-        src/tests/test-utils.c
-+       src/tests/ukwm-all.test.in       
-        src/backends/native/meta-cursor-renderer-native.c
- Copyright:
-    Copyright 2014 Red Hat Inc.
-@@ -455,8 +451,7 @@ Copyright:
-    Copyright (C) 2005 Elijah Newren
- License: GPL-2+
- 
--Files: src/core/core.c
--       src/core/util-private.h
-+Files: src/core/util-private.h
-        src/core/util.c
-        src/meta/common.h
-        src/meta/util.h
-@@ -2411,6 +2406,7 @@ Files: ABOUT-NLS
-        debian/ukwm.install
-        debian/ukwm.postinst
-        debian/ukwm.prerm
-+       debian/upstream/metadata       
-        debian/watch
-        doc/code-overview.txt
-        doc/dialogs.txt
-@@ -2568,8 +2564,7 @@ Files: ABOUT-NLS
-        src/tests/stacking/mixed-windows.metatest
-        src/tests/stacking/override-redirect.metatest
-        src/tests/stacking/set-parent.metatest
--       src/tests/ukwm-all.test.in
--       src/wayland/meta-wayland-dma-buf.h
-+       src/tests/ukwm-all.testmeta-wayland-dma-buf.h       
-        src/wayland/protocol/gtk-primary-selection.xml
-        src/wayland/protocol/gtk-shell.xml
-        src/x11/ukwm-Xatomtype.h
--- 
-2.30.0
-

ukwm.spec

@@ -1,12 +1,13 @@
+%define debug_package %{nil}
+
 Name:           ukwm
-Version:        1.2.1
+Version:        1.2.0
-Release:        8
+Release:        1
 Summary:        lightweight GTK+ window manager
-License:        LGPL-2.0-or-later and GPL-2.0-or-later and MIT
+License:        GPL-2+ LGPL-2+ MIT~OldStyle+LegalDisclaimer Expat SGI-B-2.0 
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         0001-Bump-dependency-on-gsettings-desktop-schemas-3.31.0.patch
+
-Patch1:         0002-update-copyright.patch 
 #BuildRequires: dh-sequence-gir is in gobject-introspection
 BuildRequires: gobject-introspection
 #BuildRequires: gnome-pkg-tools >= 0.10  debian package tool
@@ -73,8 +74,6 @@ BuildRequires: xkeyboard-config
 BuildRequires: xorg-x11-server-Xvfb
 
 BuildRequires: xauth
-BuildRequires: intltool
-BuildRequires: chrpath
 Requires: clutter
 %description
  Ukwm is a small window manager, using GTK+ and Clutter to do
@@ -155,28 +154,38 @@ Ukwm is a small window manager, using GTK+ and Clutter to do
 
 %prep
 %setup -q
-%patch0 -p1
+
-%patch1 -p1
 %build
-%define gettext_version %(dnf info gettext |grep Version |awk '{print $3}'| awk -F "." 'BEGIN {OFS = FS} {print $1,$2}'|awk 'NR==1')
+./autogen.sh
-sed -i 's/GETTEXT_MACRO_VERSION = .*/GETTEXT_MACRO_VERSION = %{gettext_version}/g' po/Makefile.in.in
+make
-
-./autogen.sh --prefix=/usr --libdir=/usr/lib64
-
-%{make_build}
 
 %install
 rm -rf $RPM_BUILD_ROOT 
-%{make_install} DESTDIR=%{buildroot}
+#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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%preun
+%pretun
 update-alternatives --remove x-window-manager \
-        /usr/bin/ukwm &> /dev/null || :
+        /usr/bin/ukwm
         
 %post
 update-alternatives --install /usr/bin/x-window-manager \
@@ -186,14 +195,14 @@ update-alternatives --install /usr/bin/x-window-manager \
         
 %files 
 %{_bindir}/*
-%{_libexecdir}/ukwm-restart-helper
+%{_prefix}/lib//ukwm/ukwm-restart-helper
-%{_libdir}/ukwm/plugins/
+%{_prefix}/local/lib/ukwm/plugins/
 %{_datadir}/applications/
 %{_datadir}/ukui/plugin/org.ukui.ukwm.UkwmPlugin.xml
 
 %files -n libukwm-1-0
-%{_libdir}/libukwm-1.so*
+%{_prefix}/local/lib/libukwm-1.so.*
-%{_libdir}/ukwm/*.so
+%{_prefix}/local/lib/ukwm/*.so
 
 %files common
 %doc debian/copyright debian/changelog
@@ -204,40 +213,19 @@ update-alternatives --install /usr/bin/x-window-manager \
 %{_datadir}/gnome-control-center
 
 %files -n libukwm-1-dev
-%{_includedir}/
+%{_prefix}/include
-%{_libdir}/pkgconfig/*.pc
+%{_prefix}/local/lib/lib*.so
-%{_libdir}/ukwm/*.gir
+%{_prefix}/local/lib/pkgconfig/*.pc
+%{_prefix}/local/lib/ukwm/*.gir
 
 %files -n gir1.2-ukwm-1
-%{_libdir}/ukwm/*.typelib
+%{_prefix}/local/lib/ukwm/*.typelib
 
-%exclude %{_libdir}/libukwm-1.la
+%exclude %{_prefix}/local/lib/libukwm-1.la
-%exclude %{_libdir}/ukwm/*.la
+%exclude %{_prefix}/local/lib/ukwm/*.la
+%exclude %{_datadir}/ukui
 
 %changelog
-* Mon Oct 23 2023 peijiankang <peijiankang@kylinos.cn> - 1.2.1-8
-- fix build error
-
-* 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
-
-* Fri Feb 3 2023 douyan <douyan@kylinos.cn> - 1.2.1-5
-- fix build error and uninstall issue
-
-* Wed May 25 2022 tanyulong <tanyulong@kylinos.cn> - 1.2.1-4
-- Improve the project according to the requirements of compliance improvement
-
-* Thu Dec 23 2021 pei-jiankang <peijiankang@kylinos.cn> - 1.2.1-3
-- update copyright
-
-* Thu Dec 23 2021 pei-jiankang <peijiankang@kylinos.cn> - 1.2.1-2
-- Bump dependency on gsettings desktop schemas 3.31.0
-
-* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 1.2.1-1
-- update to upstream version 1.2.1
-
 * Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 1.2.0-1
 - Init package for openEuler
+

ukwm.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: ukui/ukwm
-tag_prefix: "^v"
-separator: "."