From 221b4f69dd2999eea6db3ae9de279dea7973603a Mon Sep 17 00:00:00 2001 From: panchenbo Date: Thu, 30 Jul 2020 15:37:57 +0800 Subject: [PATCH] add yaml and fix spec --- dde-kwin.spec | 46 ++-------------------------------------------- dde-kwin.yaml | 4 ++++ 2 files changed, 6 insertions(+), 44 deletions(-) create mode 100644 dde-kwin.yaml diff --git a/dde-kwin.spec b/dde-kwin.spec index 0ba9582..b0a1b7a 100644 --- a/dde-kwin.spec +++ b/dde-kwin.spec @@ -7,10 +7,6 @@ Summary: KWin configuration for Deepin Desktop Environment License: GPLv3+ URL: https://github.com/linuxdeepin/%{name} Source0: %{name}_%{version}.orig.tar.xz -# https://git.archlinux.org/svntogit/community.git/commit/trunk?h=packages/deepin-kwin&id=aac44be15651bbaa2d4f7d100ecd9dbc4a79236a -# Fix runtime issue with kwin 5.17 -#Patch0: kwin-5.17.patch -#Patch1: https://github.com/linuxdeepin/dde-kwin/pull/106.patch BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: kwin-devel @@ -22,7 +18,6 @@ BuildRequires: kf5-kwayland-devel BuildRequires: kf5-kglobalaccel-devel BuildRequires: cmake(KDecoration2) BuildRequires: qt5-linguist -# for libQt5EdidSupport.a BuildRequires: qt5-qtbase-static BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtdeclarative-devel @@ -30,9 +25,7 @@ BuildRequires: dtkgui-devel BuildRequires: kf5-ki18n-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: dde-qt5integration%{?_isa} -#Requires: kwin%{?_isa} >= 5.17 Requires: kwin%{?_isa} >= 5.15 -# since F31 Obsoletes: deepin-wm <= 1.9.38 Obsoletes: deepin-wm-switcher <= 1.1.9 Obsoletes: deepin-metacity <= 3.22.24 @@ -66,14 +59,11 @@ Header files and libraries for %{sname}. %prep %setup -q -n %{name}-%{version} -#%patch0 -p2 -#%patch1 -p1 sed -i 's:/lib:/%{_lib}:' plugins/kwin-xcb/lib/CMakeLists.txt sed -i 's:/usr/lib:%{_libdir}:' plugins/kwin-xcb/plugin/main.cpp sed -i 's:/usr/lib:%{_libexecdir}:' deepin-wm-dbus/deepinwmfaker.cpp %build -# help find (and prefer) qt5 utilities, e.g. qmake, lrelease export PATH=%{_qt5_bindir}:$PATH %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=Release -DKWIN_VERSION=$(rpm -q --qf '%%{version}' kwin-devel) . %make_build @@ -93,9 +83,7 @@ chmod 755 %{buildroot}%{_bindir}/kwin_no_scale %{_libdir}/libkwin-xcb.so.* %{_qt5_plugindir}/org.kde.kdecoration2/libdeepin-chameleon.so %{_qt5_plugindir}/platforms/lib%{name}-xcb.so -#{_qt5_plugindir}/kwin/effects/plugins/ %{_datadir}/dde-kwin-xcb/ -#%{_datadir}/applications/kwin-wm-multitaskingview.desktop %{_datadir}/dbus-1/services/*.service %{_datadir}/dbus-1/interfaces/*.xml %{_datadir}/kwin/scripts/* @@ -111,35 +99,5 @@ chmod 755 %{buildroot}%{_bindir}/kwin_no_scale %{_includedir}/%{name} %changelog -* Thu Feb 27 2020 Robin Lee - 0.1.0-6 -- Fix path conflict with kdeplasma-addons (RHBZ#1807283) - -* Tue Jan 28 2020 Fedora Release Engineering - 0.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Dec 23 2019 Robin Lee - 0.1.0-4 -- Fix runtime issue with kwin 5.17 - -* Mon Dec 09 2019 Jan Grulich - 0.1.0-3 -- rebuild (qt5) - -* Wed Sep 25 2019 Jan Grulich - 0.1.0-2 -- rebuild (qt5) - -* Wed Jul 24 2019 Fedora Release Engineering - 0.0.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 17 2019 Jan Grulich - 0.0.4-3 -- rebuild (qt5) - -* Wed Jun 05 2019 Jan Grulich - 0.0.4-2 -- rebuild (qt5) - -* Mon Apr 22 2019 Robin Lee - 0.0.4-1 -- new version - -* Mon Apr 15 2019 Robin Lee - 0.0.3.2-1 -- Update to 0.0.3.2 - -* Fri Apr 12 2019 Robin Lee - 0.0.3.1-1 -- Initial packaging +* Thu Jul 30 2020 openEuler Buildteam - 5.0.13+c1-6 +- Package init diff --git a/dde-kwin.yaml b/dde-kwin.yaml new file mode 100644 index 0000000..5243f8c --- /dev/null +++ b/dde-kwin.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: linuxdeepin/dde-kwin +tag_prefix: ^v +seperator: . -- Gitee