diff options
| author | B Stack <bgstack15@gmail.com> | 2019-02-19 09:03:50 -0500 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-02-19 09:03:50 -0500 |
| commit | 7cbc853c51d7a202772626410e25158c42364d06 (patch) | |
| tree | abab002d5d3b5beacf5b6ab452791150b6738df0 /freefilesync/freefilesync.spec | |
| parent | fix distro patch files (diff) | |
| download | stackrpms-7cbc853c51d7a202772626410e25158c42364d06.tar.gz stackrpms-7cbc853c51d7a202772626410e25158c42364d06.tar.bz2 stackrpms-7cbc853c51d7a202772626410e25158c42364d06.zip | |
WIP: remove the use of %dist to include patches
I finally realized that copr builds the srpm in a fedora environment and
then uses that srpm everywhere, including the epel-6 and epel-7 chroots,
where the el7.patch file was now absent. So now the spec depends on both
ffs_fedora.patch and ffs_el.patch
Diffstat (limited to 'freefilesync/freefilesync.spec')
| -rw-r--r-- | freefilesync/freefilesync.spec | 17 |
1 files changed, 12 insertions, 5 deletions
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 |