diff options
l--------- | freefilesync/ffs.fc29.patch | 1 | ||||
l--------- | freefilesync/ffs.fc30.patch | 1 | ||||
-rw-r--r-- | freefilesync/ffs_el.patch (renamed from freefilesync/ffs.rhel7.patch) | 0 | ||||
-rw-r--r-- | freefilesync/ffs_fedora.patch (renamed from freefilesync/ffs.fc28.patch) | 0 | ||||
-rw-r--r-- | freefilesync/freefilesync.spec | 17 |
5 files changed, 12 insertions, 7 deletions
diff --git a/freefilesync/ffs.fc29.patch b/freefilesync/ffs.fc29.patch deleted file mode 120000 index b367df2..0000000 --- a/freefilesync/ffs.fc29.patch +++ /dev/null @@ -1 +0,0 @@ -ffs.fc28.patch
\ No newline at end of file diff --git a/freefilesync/ffs.fc30.patch b/freefilesync/ffs.fc30.patch deleted file mode 120000 index b367df2..0000000 --- a/freefilesync/ffs.fc30.patch +++ /dev/null @@ -1 +0,0 @@ -ffs.fc28.patch
\ No newline at end of file diff --git a/freefilesync/ffs.rhel7.patch b/freefilesync/ffs_el.patch index 0763296..0763296 100644 --- a/freefilesync/ffs.rhel7.patch +++ b/freefilesync/ffs_el.patch diff --git a/freefilesync/ffs.fc28.patch b/freefilesync/ffs_fedora.patch index 02caceb..02caceb 100644 --- a/freefilesync/ffs.fc28.patch +++ b/freefilesync/ffs_fedora.patch diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index df5661c..2b39407 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -26,11 +26,12 @@ URL: http://www.freefilesync.org/ Source0: https://gitlab.com/opensource-tracking/%{pkgname}/-/archive/%{version}/%{pkgname}-%{version}.tar.gz Source1: %{pkgname}.desktop Source2: %{prog2name}.desktop -Patch0: ffs_no_check_updates.patch -Patch1: ffs_no_wx311.patch -Patch2: ffs%{?rhel:.el%{?rhel}}%{!?rhel:%{?dist}}.patch -Patch3: ffs_allow_parallel_ops.patch -Patch4: ffs_sftp.patch +Patch0: ffs_allow_parallel_ops.patch +Patch1: ffs_no_check_updates.patch +Patch2: ffs_no_wx311.patch +Patch3: ffs_sftp.patch +Patch4: ffs_fedora.patch +Patch5: ffs_el.patch Packager: B Stack <bgstack15@gmail.com> # WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system. @@ -74,7 +75,13 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%if 0%{?el6}%{?el7} +# use the el patch +%patch5 -p1 +%else +# use the fedora patch %patch4 -p1 +%fi # custom build parameters for packaging application in rpm # fedora provides build_cxxflags, which is really just optflags |