!4 update to version 3.0.0

Merge pull request !4 from dou33/update

peony-extensions.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:           peony-extensions
-Version:        2.1.2
+Version:        3.0.0
-Release:        2
+Release:        1
 Summary:        Peony qt extensions (common files)
 License:        LGPL-3.0+
 URL:            http://www.ukui.org
@@ -14,16 +14,18 @@ BuildRequires: glib2-devel
 BuildRequires: qt5-qtbase-devel
 BuildRequires: qtchooser
 BuildRequires: libpeony-dev
-BuildRequires: libpeony2
+#BuildRequires: libpeony3
 BuildRequires: peony
 BuildRequires: poppler-qt5-devel
 BuildRequires: gsettings-qt-devel
 
 Requires: samba-common-tools
 Requires: samba
-#Requires: engrampa
+Requires: engrampa
 Requires: mate-terminal
-Requires: libpeony2
+Requires: libpeony3
+Requires: qt5-qtimageformats
+Requires: polkit
 
 %description
  Peony is the official file manager for the UKUI desktop. This
@@ -33,30 +35,31 @@ Requires: libpeony2
 %setup -q
 
 %build
-mkdir build && cd build
+export PATH=%{_qt5_bindir}:$PATH
-cmake ..
+mkdir qmake-build
-make
+pushd qmake-build
+%{qmake_qt5}  ..
+%{make_build}
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
+pushd qmake-build
+%{make_install} INSTALL_ROOT=%{buildroot}
+popd
 
-cd %{_builddir}/%{name}-%{version}/build
-#make INSTALL_ROOT=/root/rpmbuild/BUILDROOT install
-
-mkdir -p %{buildroot}/usr/lib/peony-qt-extensions
-cp -rf %{_builddir}/%{name}-%{version}/peony-extensions-cmake/peony-qt-share/libpeony-qt-share.* %{buildroot}/usr/lib/peony-qt-extensions
-
-cp -rf %{_builddir}/%{name}-%{version}/testdir/libpeony-qt-engrampa-menu-plugin.* %{buildroot}/usr/lib/peony-qt-extensions
-cp -rf %{_builddir}/%{name}-%{version}/testdir/libpeony-qt-menu-plugin-mate-terminal.* %{buildroot}/usr/lib/peony-qt-extensions
-cp -rf %{_builddir}/%{name}-%{version}/testdir/libpeony-qt-computer-view-plugin.so %{buildroot}/usr/lib/peony-qt-extensions
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %doc debian/copyright  debian/changelog
-%{_prefix}/lib/peony-qt-extensions
+%{_libdir}/peony-extensions
+%{_prefix}/share/
 
 %changelog
+* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.0-1
+- update to upstream version 3.0.0
+
 * Tue Sep 22 2020 douyan <douyan@kylinos.cn> - 2.1.2-2
 - fix peony file share issue