fix conflict lib file

This commit is contained in:
dou33 2022-03-02 10:45:29 +08:00
parent 7fdf6a9525
commit 69f72bd110

View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: ukui-interface Name: ukui-interface
Version: 1.0.2 Version: 1.0.2
Release: 3 Release: 4
Summary: UKUI interface provides the interface for system configuration and related libraries. Summary: UKUI interface provides the interface for system configuration and related libraries.
License: GPL-3+ Apache-2.0 License: GPL-3+ Apache-2.0
URL: https://github.com/ukui/ukui-interface 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 BuildRequires: glib2-devel autoconf automake libtool qt5-qtbase-devel gsettings-qt-devel qt5-qttools-devel iniparser
Provides: libukui-log4qt libukui-log4qt-devel
%description %description
ukui interface provides the interface for system configuration and related libraries. 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 %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
@ -64,18 +55,14 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/ukuisdk/kylin-*.h %{_includedir}/ukuisdk/kylin-*.h
%{_libdir}/libukui* %{_libdir}/libukui*
%{_datadir}/dbus-1/services/*.service %{_datadir}/dbus-1/services/*.service
%files -n libukui-log4qt
%doc debian/copyright debian/changelog
%{_includedir}/ukui-log4qt.h %{_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 %{_datadir}/glib-2.0/schemas/org.ukui.log4qt.gschema.xml
%changelog %changelog
* Wed Mar 2 2022 douyan <douyan@kylinos.cn> - 1.0.2-4
- fix conflict lib file
* Fri Feb 25 2022 douyan <douyan@kylinos.cn> - 1.0.2-3 * Fri Feb 25 2022 douyan <douyan@kylinos.cn> - 1.0.2-3
- add ukui-log4qt package - add ukui-log4qt package