From 84d87a64c56d3602295ba6af2b61d5f7308c62faef13122329bc050014b1e812 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Fri, 16 Feb 2018 15:22:41 +0000 Subject: [PATCH] Accepting request 577288 from home:alois:branches:devel:languages:pascal - Removed xorg-x11-devel build requirement - Added peazip-help_path.patch to use the correct path for the pdf guide OBS-URL: https://build.opensuse.org/request/show/577288 OBS-URL: https://build.opensuse.org/package/show/devel:languages:pascal/peazip?expand=0&rev=29 --- peazip-help_path.patch | 35 +++++++++++++++++++++++++++++++++++ peazip.changes | 8 ++++++++ peazip.spec | 4 +++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 peazip-help_path.patch diff --git a/peazip-help_path.patch b/peazip-help_path.patch new file mode 100644 index 0000000..f01e720 --- /dev/null +++ b/peazip-help_path.patch @@ -0,0 +1,35 @@ +Index: peazip-6.5.0.src/peach.pas +=================================================================== +--- peazip-6.5.0.src.orig/peach.pas ++++ peazip-6.5.0.src/peach.pas +@@ -35341,7 +35341,7 @@ end; + + procedure TForm_peach.baboutlocalhelpClick(Sender: TObject); + begin +-cp_open(executable_path+'peazip_help.pdf',desk_env); ++cp_open('/usr/share/doc/packages/peazip/peazip_help.pdf',desk_env); + end; + + procedure TForm_peach.baboutsupportClick(Sender: TObject); +@@ -54349,7 +54349,7 @@ end; + procedure TForm_peach.mpeahelpofflineClick(Sender: TObject); + begin + //cp_open('http://www.peazip.org/peazip_help.pdf',desk_env); +-cp_open(executable_path+'peazip_help.pdf',desk_env); ++cp_open('/usr/share/doc/packages/peazip/peazip_help.pdf',desk_env); + end; + + procedure TForm_peach.mRecent9Click(Sender: TObject); +Index: peazip-6.5.0.src/unit4.pas +=================================================================== +--- peazip-6.5.0.src.orig/unit4.pas ++++ peazip-6.5.0.src/unit4.pas +@@ -122,7 +122,7 @@ end; + + procedure TFormAbout.baboutlocalhelpClick(Sender: TObject); + begin +- cp_open(executable_path+'peazip_help.pdf',desk_env); ++ cp_open('/usr/share/doc/packages/peazip/peazip_help.pdf',desk_env); + end; + + initialization diff --git a/peazip.changes b/peazip.changes index 5d28afd..631415b 100644 --- a/peazip.changes +++ b/peazip.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 16 14:54:48 UTC 2018 - aloisio@gmx.com + +- Removed xorg-x11-devel build requirement + +- Added peazip-help_path.patch to use the correct path for the + pdf guide + ------------------------------------------------------------------- Sun Feb 11 12:25:23 UTC 2018 - aloisio@gmx.com diff --git a/peazip.spec b/peazip.spec index 46db685..7823c3e 100644 --- a/peazip.spec +++ b/peazip.spec @@ -32,6 +32,8 @@ Patch0: peazip-desktop.patch Patch1: peazip-lazarus_1.8.0.patch # PATCH-FIX-OPENSUSE peazip-build_PIE.patch -- aloisio@gmx.com Patch2: peazip-build_PIE.patch +# PATCH-FIX-OPENSUSE peazip-help_path.patch set correct path for the pdf guide -- aloisio@gmx.com +Patch3: peazip-help_path.patch BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: fpc @@ -42,7 +44,6 @@ BuildRequires: libQt5Pas-devel BuildRequires: p7zip BuildRequires: unzip BuildRequires: upx -BuildRequires: xorg-x11-devel Requires: p7zip Requires: upx %if 0%{?suse_version} < 1500 @@ -78,6 +79,7 @@ This subpackage contains the KF5 integration. %patch0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 chmod +w res/lang dos2unix readme cp %{SOURCE2} .