sergiomb pushed to smb4k (master). "Fix mixed-use-of-spaces-and-tabs and desktop-file-install sriptlet"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Jun 9 22:43:44 UTC 2015


From 40e1e0c2cd397eb00c66d065bd163b08fefc7317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio at serjux.com>
Date: Tue, 9 Jun 2015 23:42:50 +0100
Subject: Fix mixed-use-of-spaces-and-tabs and desktop-file-install sriptlet


diff --git a/smb4k.spec b/smb4k.spec
index fb02a61..6787bd1 100644
--- a/smb4k.spec
+++ b/smb4k.spec
@@ -1,22 +1,22 @@
-Name:		smb4k
-Version:	1.2.0
-Release:	1%{?dist}
-Summary:	The SMB/CIFS Share Browser for KDE
+Name:       smb4k
+Version:    1.2.0
+Release:    2%{?dist}
+Summary:    The SMB/CIFS Share Browser for KDE
 
-Group:		Applications/Internet
-License:	GPLv2+
-URL:		http://smb4k.sourceforge.net/
+Group:      Applications/Internet
+License:    GPLv2+
+URL:        http://smb4k.sourceforge.net/
 
 Source0: http://downloads.sourceforge.net/smb4k/%{name}-%{version}.tar.xz
 Patch0:  %{name}-1.2.0_fixbuild.patch
 
-BuildRequires:	cmake >= 2.6.0
-BuildRequires:	kdelibs4-devel >= 4.4.0
-BuildRequires:	gettext
+BuildRequires:  cmake >= 2.6.0
+BuildRequires:  kdelibs4-devel >= 4.4.0
+BuildRequires:  gettext
 BuildRequires: libappstream-glib
-Requires:	samba-client
-Requires:	cifs-utils
-Requires:	kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires:   samba-client
+Requires:   cifs-utils
+Requires:   kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 # on F15 we need remove old smb4k-devel
 Obsoletes: smb4k-devel < 1.0.0
 
@@ -43,12 +43,13 @@ make install DESTDIR=%{buildroot} -C %{_target_platform}
 # add-category Network, because is Network application, search and map SMB/CIFS shares of LAN.
 # add-category KDE, because is Application based on KDE libraries.
 # add-category Utility, because is a small utility application.
-desktop-file-install --vendor="" \
-	--dir=%{buildroot}%{_kde4_datadir}/applications/kde4 \
-	--add-category Network \
-	--add-category KDE \
-	--add-category Utility \
-	%{buildroot}%{_kde4_datadir}/applications/kde4/smb4k.desktop
+desktop-file-install \
+    --dir=%{buildroot}%{_kde4_datadir}/applications/kde4 \
+    --add-category Network \
+    --add-category KDE \
+    --add-category Utility \
+    --delete-original \
+    %{buildroot}%{_kde4_datadir}/applications/kde4/smb4k.desktop
 
 desktop-file-validate %{buildroot}/%{_kde4_datadir}/applications/kde4/smb4k.desktop
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
@@ -95,6 +96,9 @@ fi
 %{_datadir}/appdata/smb4k.appdata.xml
 
 %changelog
+* Tue Jun 09 2015 Sérgio Basto <sergio at serjux.com> - 1.2.0-2
+- Fix mixed-use-of-spaces-and-tabs and desktop-file-install sriptlet
+
 * Sun Apr 19 2015 Sérgio Basto <sergio at serjux.com> - 1.2.0-1
 - Update to 1.2.0
 - Added AppData https://fedoraproject.org/wiki/Packaging:AppData
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/smb4k.git/commit/?h=master&id=40e1e0c2cd397eb00c66d065bd163b08fefc7317


More information about the scm-commits mailing list