Attachment 7521 Details for Bug 17901 – svn diff

[patch] svn diff

file_17901.txt (text/plain), 1.83 KB, created by Barry Jackson on 2016-03-07 23:32:35 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Barry Jackson

Created: 2016-03-07 23:32:35 CET

Size: 1.83 KB

patch

obsolete

>Index: SPECS/kde-rootactions-servicemenu.spec
>===================================================================
>--- SPECS/kde-rootactions-servicemenu.spec	(revision 987169)
>+++ SPECS/kde-rootactions-servicemenu.spec	(working copy)
>@@ -1,19 +1,15 @@
>-
> %define oname	rootactions_servicemenu
> 
> Summary:	Root actions for Dolphin context menu
> Name:		kde-rootactions-servicemenu
>-Version:	2.7.3
>-Release:	%mkrel 6
>+Version:	2.8.7
>+Release:	%mkrel 0.5
> License:	GPLv2+
> Group:		Graphical desktop/KDE
> URL:		http://www.kde-apps.org/content/show.php/?content=48411
> Source0:	http://www.kde-apps.org/CONTENT/content-files/48411-%{oname}_%{version}.tar.gz
>-# adapt for kdesu in %{_libdir}/kde4/libexec/kdesu
>-Patch0:		rootactions-1.2.4-mga-kdesu.patch
> BuildArch:	noarch
>-BuildRequires:	kde4-macros
>-Requires:	kdebase4-workspace
>+Requires:	plasma-workspace
> Obsoletes:	kde_servicemenu_rootactions < %{version}
> Obsoletes:	openasroot-kmenu < 1.0-7
> Provides:	openasroot-kmenu = 1.1
>@@ -25,19 +21,16 @@
> 
> %prep
> %setup -q -n %{oname}_%version
>-%patch0 -p1
> 
> %install
> install -d -m755 %{buildroot}%{_bindir}
> install -m755 Root_Actions_%{version}/*.pl %{buildroot}%{_bindir}
> 
>-install -d -m755 %{buildroot}%{_kde_services}/ServiceMenus
>-install -m644 Root_Actions_%{version}/dolphin-KDE4/* %{buildroot}%{_kde_services}/ServiceMenus
>+install -d -m755 %{buildroot}/usr/share/kservices5/ServiceMenus
>+install -m644 Root_Actions_%{version}/dolphin-KDE4/* %{buildroot}/usr/share/kservices5/ServiceMenus
> 
> %files
> %doc README changelog
> %{_bindir}/rootactions-servicemenu.pl
>-%{_kde_services}/ServiceMenus/10-rootactionsfolders.desktop
>-%{_kde_services}/ServiceMenus/11-rootactionsfiles.desktop
>-
>-
>+%{_datadir}/kservices5/ServiceMenus/10-rootactionsfolders.desktop
>+%{_datadir}/kservices5/ServiceMenus/11-rootactionsfiles.desktop

Index: SPECS/kde-rootactions-servicemenu.spec
===================================================================
--- SPECS/kde-rootactions-servicemenu.spec	(revision 987169)
+++ SPECS/kde-rootactions-servicemenu.spec	(working copy)
@@ -1,19 +1,15 @@
-
 %define oname	rootactions_servicemenu
 
 Summary:	Root actions for Dolphin context menu
 Name:		kde-rootactions-servicemenu
-Version:	2.7.3
-Release:	%mkrel 6
+Version:	2.8.7
+Release:	%mkrel 0.5
 License:	GPLv2+
 Group:		Graphical desktop/KDE
 URL:		http://www.kde-apps.org/content/show.php/?content=48411
 Source0:	http://www.kde-apps.org/CONTENT/content-files/48411-%{oname}_%{version}.tar.gz
-# adapt for kdesu in %{_libdir}/kde4/libexec/kdesu
-Patch0:		rootactions-1.2.4-mga-kdesu.patch
 BuildArch:	noarch
-BuildRequires:	kde4-macros
-Requires:	kdebase4-workspace
+Requires:	plasma-workspace
 Obsoletes:	kde_servicemenu_rootactions < %{version}
 Obsoletes:	openasroot-kmenu < 1.0-7
 Provides:	openasroot-kmenu = 1.1
@@ -25,19 +21,16 @@
 
 %prep
 %setup -q -n %{oname}_%version
-%patch0 -p1
 
 %install
 install -d -m755 %{buildroot}%{_bindir}
 install -m755 Root_Actions_%{version}/*.pl %{buildroot}%{_bindir}
 
-install -d -m755 %{buildroot}%{_kde_services}/ServiceMenus
-install -m644 Root_Actions_%{version}/dolphin-KDE4/* %{buildroot}%{_kde_services}/ServiceMenus
+install -d -m755 %{buildroot}/usr/share/kservices5/ServiceMenus
+install -m644 Root_Actions_%{version}/dolphin-KDE4/* %{buildroot}/usr/share/kservices5/ServiceMenus
 
 %files
 %doc README changelog
 %{_bindir}/rootactions-servicemenu.pl
-%{_kde_services}/ServiceMenus/10-rootactionsfolders.desktop
-%{_kde_services}/ServiceMenus/11-rootactionsfiles.desktop
-
-
+%{_datadir}/kservices5/ServiceMenus/10-rootactionsfolders.desktop
+%{_datadir}/kservices5/ServiceMenus/11-rootactionsfiles.desktop

Actions: View | Diff

Attachments on bug 17901: 7521