Attachment 7839 Details for Bug 18441 – proposed patch

[patch] proposed patch

svndiff (text/plain), 1.67 KB, created by Barry Jackson on 2016-05-23 22:34:51 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Barry Jackson

Created: 2016-05-23 22:34:51 CEST

Size: 1.67 KB

patch

obsolete

>Index: SPECS/kdiff3.spec
>===================================================================
>--- SPECS/kdiff3.spec	(revision 1018093)
>+++ SPECS/kdiff3.spec	(working copy)
>@@ -1,13 +1,18 @@
> Summary:	Utility for comparing/merging up to three text files or directories
> Name:		kdiff3
> Version:	0.9.98
>-Release:	%mkrel 4
>+Release:	%mkrel 5
> License:	GPLv2+
> Group:		Development/Other
>-Source:		http://downloads.sourceforge.net/kdiff3/kdiff3-%{version}.tar.gz
> Url:		http://kdiff3.sourceforge.net/
>+Source0:	http://downloads.sourceforge.net/kdiff3/kdiff3-%{version}.tar.gz
>+# http://kde-apps.org/content/show.php/Kdiff3+Compare+Menu?content=176006
>+# kdiff3_servicemenu is GPL
>+Source1:	kdiff3_servicemenu.desktop
>+
> BuildRequires:	kdebase4-devel
> BuildRequires:	desktop-file-utils
>+BuildRequires:	kf5-macros
> 
> %description
> A file and directory diff and merge tool which:
>@@ -28,11 +33,14 @@
> %install
> %makeinstall_std -C build
> 
>+mkdir -p %{buildroot}%{_kf5_services}/ServiceMenus
>+cp %{SOURCE1} %{buildroot}%{_kf5_services}/ServiceMenus/
>+
> desktop-file-install --vendor="" \
>   --add-category="Qt" \
>   --add-category="KDE" \
>   --add-category="Development" \
>-  --dir $RPM_BUILD_ROOT%{_kde_datadir}/applications/kde4 $RPM_BUILD_ROOT%{_kde_datadir}/applications/kde4/*.desktop
>+  --dir %{buildroot}%{_kde_datadir}/applications/kde4 %{buildroot}%{_kde_datadir}/applications/kde4/*.desktop
> 
> %find_lang %{name} %{name} kdiff3plugin --with-html
> 
>@@ -45,4 +53,5 @@
> %{_kde_services}/*.desktop
> %{_datadir}/locale/*/LC_MESSAGES/kdiff3fileitemactionplugin.mo
> %{_datadir}/apps/kdiff3part/kdiff3_part.rc
>-
>+%{_kde_datadir}/applications/kde4/*.desktop
>+%{_kf5_services}/ServiceMenus/kdiff3_servicemenu.desktop

Index: SPECS/kdiff3.spec
===================================================================
--- SPECS/kdiff3.spec	(revision 1018093)
+++ SPECS/kdiff3.spec	(working copy)
@@ -1,13 +1,18 @@
 Summary:	Utility for comparing/merging up to three text files or directories
 Name:		kdiff3
 Version:	0.9.98
-Release:	%mkrel 4
+Release:	%mkrel 5
 License:	GPLv2+
 Group:		Development/Other
-Source:		http://downloads.sourceforge.net/kdiff3/kdiff3-%{version}.tar.gz
 Url:		http://kdiff3.sourceforge.net/
+Source0:	http://downloads.sourceforge.net/kdiff3/kdiff3-%{version}.tar.gz
+# http://kde-apps.org/content/show.php/Kdiff3+Compare+Menu?content=176006
+# kdiff3_servicemenu is GPL
+Source1:	kdiff3_servicemenu.desktop
+
 BuildRequires:	kdebase4-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:	kf5-macros
 
 %description
 A file and directory diff and merge tool which:
@@ -28,11 +33,14 @@
 %install
 %makeinstall_std -C build
 
+mkdir -p %{buildroot}%{_kf5_services}/ServiceMenus
+cp %{SOURCE1} %{buildroot}%{_kf5_services}/ServiceMenus/
+
 desktop-file-install --vendor="" \
   --add-category="Qt" \
   --add-category="KDE" \
   --add-category="Development" \
-  --dir $RPM_BUILD_ROOT%{_kde_datadir}/applications/kde4 $RPM_BUILD_ROOT%{_kde_datadir}/applications/kde4/*.desktop
+  --dir %{buildroot}%{_kde_datadir}/applications/kde4 %{buildroot}%{_kde_datadir}/applications/kde4/*.desktop
 
 %find_lang %{name} %{name} kdiff3plugin --with-html
 
@@ -45,4 +53,5 @@
 %{_kde_services}/*.desktop
 %{_datadir}/locale/*/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 %{_datadir}/apps/kdiff3part/kdiff3_part.rc
-
+%{_kde_datadir}/applications/kde4/*.desktop
+%{_kf5_services}/ServiceMenus/kdiff3_servicemenu.desktop

Actions: View | Diff

Attachments on bug 18441: 7838 | 7839