From 1f7d8355766c52c1e3eac83832af9ad14569ab69 Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Mon, 9 May 2022 00:08:50 +0800 Subject: [PATCH] sync 22.03 to master --- fix_log4qt_lib_path.patch | 12 ++++++++++++ ukui-interface.spec | 28 ++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 fix_log4qt_lib_path.patch diff --git a/fix_log4qt_lib_path.patch b/fix_log4qt_lib_path.patch new file mode 100644 index 0000000..121652d --- /dev/null +++ b/fix_log4qt_lib_path.patch @@ -0,0 +1,12 @@ +diff -Naur ukui-interface-1.0.2/src/log4qt/ukui-log4qt.pro ukui-interface-1.0.2~/src/log4qt/ukui-log4qt.pro +--- ukui-interface-1.0.2/src/log4qt/ukui-log4qt.pro 2021-11-04 16:31:37.000000000 +0800 ++++ ukui-interface-1.0.2~/src/log4qt/ukui-log4qt.pro 2022-02-25 12:37:20.906722506 +0800 +@@ -35,7 +35,7 @@ + + # Default rules for deployment. + unix { +- target.path = /usr/lib ++ target.path = /usr/lib64 + } + !isEmpty(target.path): INSTALLS += target + diff --git a/ukui-interface.spec b/ukui-interface.spec index 79ac326..52c6921 100644 --- a/ukui-interface.spec +++ b/ukui-interface.spec @@ -1,34 +1,45 @@ %define debug_package %{nil} Name: ukui-interface Version: 1.0.2 -Release: 2 +Release: 4 Summary: UKUI interface provides the interface for system configuration and related libraries. License: GPL-3+ Apache-2.0 URL: https://github.com/ukui/ukui-interface Source0: %{name}-%{version}.tar.gz +patch0: fix_log4qt_lib_path.patch + BuildRequires: glib2-devel autoconf automake libtool qt5-qtbase-devel gsettings-qt-devel qt5-qttools-devel iniparser +Provides: libukui-log4qt libukui-log4qt-devel + %description ukui interface provides the interface for system configuration and related libraries. %prep %setup -q - -./autogen.sh +%patch0 -p1 %build +./autogen.sh + %{make_build} +cd %{_builddir}/%{name}-%{version}/src/log4qt +qmake-qt5 +make %install %{make_install} INSTALL_ROOT=%{buildroot} mkdir -p %{buildroot}/usr/include/ukuisdk mv %{buildroot}/usr/include/*.h %{buildroot}/usr/include/ukuisdk +cd %{_builddir}/%{name}-%{version}/src/log4qt +make INSTALL_ROOT=%{buildroot} install %clean rm -rf $RPM_BUILD_ROOT %files +%doc debian/copyright debian/changelog %{_bindir}/ukui-backgroundserver %{_bindir}/ukui-desktopserver %{_bindir}/ukui-fontserver @@ -44,9 +55,18 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/ukuisdk/kylin-*.h %{_libdir}/libukui* %{_datadir}/dbus-1/services/*.service +%{_includedir}/ukui-log4qt.h +%{_datadir}/glib-2.0/schemas/org.ukui.log4qt.gschema.xml + %changelog -* Wed Feb 24 2021 douyan - 1.0.2-2 +* Wed Mar 2 2022 douyan - 1.0.2-4 +- fix conflict lib file + +* Fri Feb 25 2022 douyan - 1.0.2-3 +- add ukui-log4qt package + +* Wed Feb 24 2022 douyan - 1.0.2-2 - change head file location * Thu Feb 17 2022 pei-jiankang - 1.0.2-1