From 69f72bd1109e2620e7ecba3d4bda912cecf88665 Mon Sep 17 00:00:00 2001 From: dou33 Date: Wed, 2 Mar 2022 10:45:29 +0800 Subject: [PATCH] fix conflict lib file --- ukui-interface.spec | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/ukui-interface.spec b/ukui-interface.spec index 09e7773..52c6921 100644 --- a/ukui-interface.spec +++ b/ukui-interface.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: ukui-interface Version: 1.0.2 -Release: 3 +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 @@ -11,20 +11,11 @@ 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. -%package -n libukui-log4qt -Summary: ukui log tool -BuildRequires: glib2 -Provides: libukui-log4qt libukui-log4qt-devel -%description -n libukui-log4qt -UKUI interface provides the interface for system configuration - and related libraries. - . - The package contains development files for qt logging. - - %prep %setup -q %patch0 -p1 @@ -64,18 +55,14 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/ukuisdk/kylin-*.h %{_libdir}/libukui* %{_datadir}/dbus-1/services/*.service - -%files -n libukui-log4qt -%doc debian/copyright debian/changelog %{_includedir}/ukui-log4qt.h -%{_libdir}/libukui-log4qt.so -%{_libdir}/libukui-log4qt.so.1 -%{_libdir}/libukui-log4qt.so.1.0 -%{_libdir}/libukui-log4qt.so.1.0.0 %{_datadir}/glib-2.0/schemas/org.ukui.log4qt.gschema.xml %changelog +* 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