diff --git a/0001-add-x11-apps-Depend.patch b/0001-add-x11-apps-Depend.patch deleted file mode 100644 index b73b0d8..0000000 --- a/0001-add-x11-apps-Depend.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3c429c689e514467a378a18521636e6c25252d2d Mon Sep 17 00:00:00 2001 -From: pei-jiankang -Date: Thu, 16 Dec 2021 20:46:32 +0800 -Subject: [PATCH] add x11-apps Depend - ---- - debian/control | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/debian/control b/debian/control -index 1c8fb582..c9e36486 100644 ---- a/debian/control -+++ b/debian/control -@@ -6,7 +6,8 @@ Uploaders: Aron Xu , - handsome_feng - Build-Depends: debhelper-compat (= 13), - sass, --Standards-Version: 4.5.0 -+ x11-apps -+Standards-Version: 4.5.1 - Rules-Requires-Root: no - Homepage: https://www.ukui.org - Vcs-Git: https://github.com/ukui/ukui-themes.git --- -2.30.0 - diff --git a/0002-update-changelog.patch b/0002-update-changelog.patch deleted file mode 100644 index c73b2d2..0000000 --- a/0002-update-changelog.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 61ba150e78478fc209c01862852c8f86de3a4405 Mon Sep 17 00:00:00 2001 -From: pei-jiankang -Date: Thu, 23 Dec 2021 19:43:01 +0800 -Subject: [PATCH] update changelog - ---- - debian/changelog | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/debian/changelog b/debian/changelog -index 799ff098..a1d251e9 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,3 +1,10 @@ -+ukui-themes (1.4.1-1) unstable; urgency=medium -+ -+ * New upstream release. -+ - Define @text_view_bg. (Closes: #970982) -+ -+ -- handsome_feng Tue, 05 Jan 2021 03:07:22 +0000 -+ - ukui-themes (1.4.0-1) unstable; urgency=medium - - * New upstream release. --- -2.30.0 - diff --git a/ukui-themes-1.4.0.zip b/ukui-themes-1.4.0.zip deleted file mode 100644 index 7fa428b..0000000 Binary files a/ukui-themes-1.4.0.zip and /dev/null differ diff --git a/ukui-themes-3.0.1.tar.gz b/ukui-themes-3.0.1.tar.gz new file mode 100644 index 0000000..4caeb97 Binary files /dev/null and b/ukui-themes-3.0.1.tar.gz differ diff --git a/ukui-themes.spec b/ukui-themes.spec index 691ecd9..b34acc3 100644 --- a/ukui-themes.spec +++ b/ukui-themes.spec @@ -1,14 +1,15 @@ %define debug_package %{nil} Name: ukui-themes -Version: 1.4.0 -Release: 4 -Summary: Official themes for the UKUI desktop +Version: 3.0.1 +Release: 1 +Summary: Official themes for the UKUI desktop License: GPL-3 URL: http://www.ukui.org -Source0: %{name}-%{version}.zip -Patch0: 0001-add-x11-apps-Depend.patch -Patch1: 0002-update-changelog.patch -BuildRequires: cmake,libsass,sassc +Source0: %{name}-%{version}.tar.gz + +BuildRequires: libsass,sassc +BuildRequires: meson +BuildRequires: ninja-build %description This package contains the official desktop themes of the UKUI desktop @@ -16,17 +17,16 @@ BuildRequires: cmake,libsass,sassc %prep %setup -q -%patch0 -p1 -%patch1 -p1 echo $RPM_BUILD_ROOT echo %{buildroot} %build -make +meson build --prefix=%{buildroot}/usr +ninja -C build %install -#make DESTDIR=$RPM_BUILD_ROOT install -make install DESTDIR=%{buildroot} +rm -rf $RPM_BUILD_ROOT +ninja -C build install mkdir -p %{buildroot}/usr/share/glib-2.0/schemas cp -r %{_builddir}/%{name}-%{version}/debian/25_ukui-themes.gschema.override %{buildroot}/usr/share/glib-2.0/schemas/ @@ -35,13 +35,14 @@ mkdir -p %{buildroot}/usr/share/mime/packages cp -r %{_builddir}/%{name}-%{version}/ukui-custom.xml %{buildroot}/usr/share/mime/packages/ mkdir -p %{buildroot}/usr/share/themes/ -cp -r %{_builddir}/%{name}-%{version}/ukui-black %{buildroot}/usr/share/themes/ -cp -r %{_builddir}/%{name}-%{version}/ukui-white %{buildroot}/usr/share/themes/ +cp -r %{_builddir}/%{name}-%{version}/themes/ukui-black %{buildroot}/usr/share/themes/ +cp -r %{_builddir}/%{name}-%{version}/themes/ukui-white %{buildroot}/usr/share/themes/ +cp -r %{_builddir}/%{name}-%{version}/themes/ukui-dark %{buildroot}/usr/share/themes/ +cp -r %{_builddir}/%{name}-%{version}/themes/ukui-light %{buildroot}/usr/share/themes/ mkdir -p %{buildroot}/usr/share/icons/ -#cp -r %{_builddir}/%{name}-%{version}/ukui-icon-theme-basic %{buildroot}/usr/share/icons/ -cp -r %{_builddir}/%{name}-%{version}/ukui-icon-theme-classical %{buildroot}/usr/share/icons/ -cp -r %{_builddir}/%{name}-%{version}/ukui-icon-theme-default %{buildroot}/usr/share/icons/ +cp -r %{_builddir}/%{name}-%{version}/icons/ukui %{buildroot}/usr/share/icons/ +cp -r %{_builddir}/%{name}-%{version}/icons/ukui-classical %{buildroot}/usr/share/icons/ mkdir -p %{buildroot}/usr/share/doc/ukui-themes/ cp %{_builddir}/%{name}-%{version}/debian/copyright %{buildroot}/usr/share/doc/ukui-themes/ @@ -51,23 +52,30 @@ gzip %{_builddir}/%{name}-%{version}/debian/changelog > %{buildroot}/usr/share/d rm -rf $RPM_BUILD_ROOT %files -#%%{_datadir}/* +%{_datadir}/* %{_datadir}/doc/ukui-themes/ %{_datadir}/mime/packages/ukui-custom.xml %{_datadir}/glib-2.0/schemas/25_ukui-themes.gschema.override -#%%{_datadir}/icons/ukui-icon-theme-basic -%{_datadir}/icons/ukui-icon-theme-classical -%{_datadir}/icons/ukui-icon-theme-default +%{_datadir}/icons/ukui +%{_datadir}/icons/ukui-classical %{_datadir}/themes/ukui-black %{_datadir}/themes/ukui-white +%{_datadir}/themes/ukui-dark +%{_datadir}/themes/ukui-light %changelog -* Thu Dec 23 2021 pei-jiankang - 1.4.0-4 +* Wed Feb 16 2022 pei-jiankang - 3.0.1-1 +- update to upstream version 3.0.1 + +* Thu Dec 23 2021 pei-jiankang - 1.4.0-5 - update changelog -* Thu Dec 16 2021 pei-jiankang - 1.4.0-3 +* Thu Dec 16 2021 pei-jiankang - 1.4.0-4 - add x11-apps Depend +* Mon Sep 13 2021 douyan - 1.4.0-3 +- modify spec + * Thu Sep 09 2021 douyan - 1.4.0-2 - add kylin-music kylin-recorder icon