commit c8bf3326ee7c76092757d11f0c7b00c84e3ddad6
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date:   Sat Nov 9 14:26:52 2019 +0100

    - updated install and files
    - rel 1

 smb4k.spec | 61 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 30 insertions(+), 31 deletions(-)
---
diff --git a/smb4k.spec b/smb4k.spec
index 51fe11e..a47d891 100644
--- a/smb4k.spec
+++ b/smb4k.spec
@@ -5,13 +5,13 @@ Summary:      SMB share browser
 Summary(pl.UTF-8):     Przeglądarka zasobów SMB
 Name:          smb4k
 Version:       3.0.2
-Release:       0.2
+Release:       1
 License:       GPL
 Group:         X11/Applications/Networking
 Source0:       http://downloads.sourceforge.net/smb4k/%{name}-%{version}.tar.xz
 # Source0-md5: 12ea7b57edec04e74276ecc7a37801f5
 URL:           http://smb4k.sf.net
-BuildRequires:  Qt5Concurrent-devel
+BuildRequires: Qt5Concurrent-devel
 BuildRequires: Qt5Core-devel
 BuildRequires: Qt5DBus-devel
 BuildRequires: Qt5Gui-devel
@@ -32,12 +32,13 @@ BuildRequires:      kf5-kdbusaddons-devel
 BuildRequires: kf5-kdoctools-devel
 BuildRequires: kf5-ki18n-devel
 BuildRequires: kf5-kiconthemes-devel
-BuildRequires:  kf5-kio-devel
+BuildRequires: kf5-kio-devel
 BuildRequires: kf5-kjobwidgets-devel
 BuildRequires: kf5-knotifications-devel
 BuildRequires: kf5-kwallet-devel
 BuildRequires: kf5-kwindowsystem-devel
 BuildRequires: kf5-plasma-framework-devel
+BuildRequires: libsmbclient-devel
 BuildRequires: libxml2-progs
 BuildRequires: qt5-build
 BuildRequires: qt5-qmake
@@ -56,30 +57,23 @@ Przeglądarka zasobów SMB dla KDE.
 %setup -q
 
 %build
-%cmake \
-       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
-%if "%{_lib}" == "lib64"
-       -DLIB_SUFFIX=64 \
-%endif
-       .
-
+mkdir -p build
+cd build
+%cmake ../
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       kde_htmldir=%{_kdedocdir}
+%{__make} -C build install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 #fixing desktop file
-%{__sed} -e "s@Categories=Qt;KDE;Utility;@Categories=Qt;KDE;Network;@g" -i 
$RPM_BUILD_ROOT%{_desktopdir}/kde4/%{name}.desktop
+%{__sed} -e "s@Categories=Qt;KDE;Utility;@Categories=Qt;KDE;Network;@g" -i 
$RPM_BUILD_ROOT%{_desktopdir}/org.kde.smb4k.desktop
 
 %find_lang %{name} --with-kde --all-name
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la 
$RPM_BUILD_ROOT%{_libdir}/lib{smb4kconfigdialog,smb4kcore}.so
-rm -rf $RPM_BUILD_ROOT%{_includedir}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsmb4kcore.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,22 +84,27 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS ChangeLog README
+%{_docdir}/HTML/en
 %attr(755,root,root) %{_bindir}/smb4k
 %attr(755,root,root) %{_libdir}/libsmb4kcore.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsmb4kcore.so.4
-%attr(755,root,root) %{_libdir}/libsmb4ktooltips.so
-%attr(755,root,root) %{_libdir}/kde4/*.so
-%attr(755,root,root) %{_libdir}/kde4/libexec/mounthelper
-# *.la are required
-%config(noreplace) %verify(not md5 mtime size) 
/etc/dbus-1/system.d/net.sourceforge.smb4k.mounthelper.conf
-%{_datadir}/apps/kconf_update/*
-%{_datadir}/dbus-1/system-services/net.sourceforge.smb4k.mounthelper.service
-%{_datadir}/polkit-1/actions/net.sourceforge.smb4k.mounthelper.policy
-%{_datadir}/apps/smb4k
+%attr(755,root,root) %ghost %{_libdir}/libsmb4kcore.so.6
+%attr(755,root,root) %{_libdir}/plugins/smb4kconfigdialog.so
+%attr(755,root,root) %{_libexecdir}/kauth/mounthelper
+%attr(755,root,root) %{_datadir}/kconf_update/*.sh
+%{_datadir}/kconf_update/*.upd
+%{_datadir}/dbus-1/system-services/org.kde.smb4k.mounthelper.service
+%{_datadir}/dbus-1/system.d/org.kde.smb4k.mounthelper.conf
+%{_datadir}/polkit-1/actions/org.kde.smb4k.mounthelper.policy
+#%{_datadir}/apps/smb4k
 %{_datadir}/config.kcfg/smb4k.kcfg
-%{_datadir}/appdata/smb4k.appdata.xml
+%{_datadir}/metainfo/org.kde.smb4k.appdata.xml
+%{_datadir}/metainfo/org.kde.smb4kqml.appdata.xml
 %{_iconsdir}/*/*/*/*.png
-%{_desktopdir}/kde4/%{name}.desktop
+%{_desktopdir}/org.kde.smb4k.desktop
 # plasma applet - maybe could be put in external package?
-%{_datadir}/kde4/services/plasma-applet-smb4k-qml.desktop
-%{_datadir}/apps/plasma/plasmoids/smb4k-qml
+%attr(755,root,root) 
%{_libdir}/qml/org/kde/smb4k/smb4kqmlplugin/libsmb4kqmlplugin.so
+%{_libdir}/qml/org/kde/smb4k/smb4kqmlplugin/qmldir
+%{_datadir}/knotifications5/smb4k.notifyrc
+%{_datadir}/kservices5/plasma-applet-org.kde.smb4kqml.desktop
+%{_datadir}/kxmlgui5/smb4k/smb4k_shell.rc
+%{_datadir}/plasma/plasmoids/org.kde.smb4kqml
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/smb4k.git/commitdiff/c8bf3326ee7c76092757d11f0c7b00c84e3ddad6

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to