From 6bbf6744f6e567da7336d8d988841c4afed843d1 Mon Sep 17 00:00:00 2001 From: B Stack Date: Sat, 16 Feb 2019 21:04:42 -0500 Subject: WIP: freefilesync on centos7 raw This worked raw, but needs major work before release. See first few lines in spec file for what was done. Next steps: 1. Place all dependencies in a copr along with this application. 2. Merge all required code changes into a single patch file. --- freefilesync/freefilesync.spec | 73 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 9 deletions(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 591adbf..2136e86 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -1,6 +1,17 @@ +# Summary for CentOS 7 compilation of freefilesync: +# 1. city-fan repo (http://www.city-fan.org/ftp/contrib/yum-repo/) for newer libssh2 +# 2. sclo for gcc 7.3.1 +# 3. all sorts of custom patches to code in freefilesync.spec and some standalone patch files. +# 4. custom openssl 1.1.0-devel and -libs packages. %global pkgname FreeFileSync %global prog2name RealTimeSync %global dummy_package 0 +%define scl_env %{nil} +%define scl_buildreq coreutils +%if 0%{?el6}%{?el7} + %define scl_env devtoolset-7 + %define scl_buildreq devtoolset-7-toolchain +%endif Name: freefilesync Version: 10.9 Release: 1%{?dist} @@ -21,6 +32,7 @@ Patch3: ffs_fedora.patch Patch4: ffs_allow_parallel_ops.patch Patch5: ffs_old_libcurl.patch Patch6: ffs_sftp.patch +Patch7: ffs_abi.patch Packager: B Stack # WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system. @@ -35,6 +47,12 @@ BuildRequires: openssl-devel BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(zlib) +%if 0%{?el6}%{?el7} +BuildRequires: wxGTK-devel +%endif +%if "%{?scl_env}" != "" +BuildRequires: %{scl_buildreq} +%endif Requires: hicolor-icon-theme %description @@ -57,17 +75,51 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %patch4 -p1 %patch5 -p1 %patch6 -p1 - +%patch7 -p1 + +%if "%{?scl_env}" != "" + # everything minus the -fPIC got farther but failed asking for -fPIC + # another option is to use the output of "wx-config --libs std, aui --debug=no" from fc28 and find the 3.0 libs and use those here. + %{__sed} \ + -e 's|-O3 -DNDEBUG|& -I/usr/include/wx-3.0-gtk2 -I/usr/lib64/wx/include/gtk2-unicode-3.0-gtk2 -fPIC|;' \ + -e '/LINKFLAGS/s|-no-pie|& -I/usr/include/wx-3.0-gtk2 -I/usr/lib64/wx/include/gtk2-unicode-3.0-gtk2 -pthread -lwx_gtk2u_aui-3.0-gtk2 -lwx_gtk2u_xrc-3.0-gtk2 -lwx_gtk2u_html-3.0-gtk2 -lwx_gtk2u_qa-3.0-gtk2 -lwx_gtk2u_adv-3.0-gtk2 -lwx_gtk2u_core-3.0-gtk2 -lwx_baseu_xml-3.0-gtk2 -lwx_baseu_net-3.0-gtk2 -lwx_baseu-3.0-gtk2|;' \ + -e 's|-O3 -DNDEBUG|-DNDEBUG -D"warn_static(arg)= " -DZEN_LINUX %{optflags}|g' \ + -e '/LINKFLAGS/s|-s|-Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld %{__global_ldflags}|g' \ + -e '/LINKFLAGS/s|LINKLAGS\s*=\s*|&--static |;' \ + -i %{pkgname}/Source/Makefile %{pkgname}/Source/%{prog2name}/Makefile + + # old libcurl problems again, perhaps solved with http://www.city-fan.org/ftp/contrib/yum-repo/rhel7/x86_64/ + #sed -r -e '/CURLE_WEIRD_SERVER_REPLY|CURLE_HTTP2|CURLE_NO_CONNECTION_AVAILABLE|CURLE_SSL_PINNEDPUBKEYNOTMATCH|CURLE_SSL_INVALIDCERTSTATUS|CURLE_RECURSIVE_API_CALL|CURLINFO_ACTIVESOCKET/s|^|//|;' \ + # -i %{pkgname}/Source/fs/libcurl/curl_wrap.h + + # https://stackoverflow.com/questions/52567517/freefilesync-c-error-byte-is-not-a-member-of-std + sed -i '1s/^/#include \n/' zen/serialize.h zen/ring_buffer.h + + # trying to use some openssl-devel from 1.1.0 to satisfy it, from city-fan? + ## use openssl 1.0.2 on centos7 + #sed -r -e '/OPENSSL_VERSION_NUMBER/s|0x[0-9]+L|0x100020beL|;' \ + # -i FreeFileSync/Source/fs/libssh2/*.cpp + +%else +# only when not el6/el7 # custom build parameters for packaging application in rpm -%{__sed} \ - -e 's|-O3 -DNDEBUG|-DNDEBUG -D"warn_static(arg)= " -DZEN_LINUX %{build_cxxflags}|g' \ - -e '/LINKFLAGS/s|-s|%{__global_ldflags}|g' \ - -i %{pkgname}/Source/Makefile %{pkgname}/Source/%{prog2name}/Makefile + %{__sed} \ + -e 's|-O3 -DNDEBUG|-DNDEBUG -D"warn_static(arg)= " -DZEN_LINUX %{build_cxxflags}|g' \ + -e '/LINKFLAGS/s|-s|%{__global_ldflags}|g' \ + -i %{pkgname}/Source/Makefile %{pkgname}/Source/%{prog2name}/Makefile +%endif %build %if !%{dummy_package} -%make_build -C %{pkgname}/Source -%make_build -C %{pkgname}/Source/%{prog2name} + %if "%{?scl_env}" != "" + scl enable %{scl_env} /bin/bash << EOF + %endif + %make_build -C %{pkgname}/Source + # turned off while building ffs for centos 7 + #%make_build -C %{pkgname}/Source/%{prog2name} + %if "%{?scl_env}" != "" +EOF + %endif %endif %install @@ -77,7 +129,9 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ #%%make_install -C %%{pkgname}/Source/%%{prog2name} pushd %{pkgname}/Build install -d %{buildroot}%{_bindir} %{buildroot}%{_datadir}/%{name} -install -Dm 0755 -t %{buildroot}%{_bindir} Bin/%{pkgname} Bin/%{prog2name} +# turned off while building ffs for centos 7 +#install -Dm 0755 -t %{buildroot}%{_bindir} Bin/%{pkgname} Bin/%{prog2name} +install -Dm 0755 -t %{buildroot}%{_bindir} Bin/%{pkgname} cp -pr Languages %{buildroot}%{_datadir}/%{name} install -Dm 0644 ding.wav gong.wav harp.wav Resources.zip styles.gtk_rc %{buildroot}%{_datadir}/%{name} popd @@ -140,7 +194,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %license %attr(444, -, -) License.txt %doc %attr(444, -, -) Changelog.txt %{_bindir}/%{pkgname} -%{_bindir}/%{prog2name} +# turned off while building ffs for centos 7 +#%{_bindir}/%{prog2name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*x*/apps/*.png %{_datadir}/%{name} -- cgit From d37779e8b1af7b7237844a9ff7c705296718835d Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 18 Feb 2019 10:43:53 -0500 Subject: WIP: FreeFileSync on CentOS 7, part 1 In my original dev environment, I can now compile and execute the main binaries. My next commit should include some attempts at static linking so the runtime environment does not need the hacked openssl 1.1.0h packages. --- freefilesync/freefilesync.spec | 83 ++++++++++++------------------------------ 1 file changed, 24 insertions(+), 59 deletions(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 2136e86..6d4caf9 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -1,16 +1,17 @@ -# Summary for CentOS 7 compilation of freefilesync: -# 1. city-fan repo (http://www.city-fan.org/ftp/contrib/yum-repo/) for newer libssh2 -# 2. sclo for gcc 7.3.1 -# 3. all sorts of custom patches to code in freefilesync.spec and some standalone patch files. -# 4. custom openssl 1.1.0-devel and -libs packages. %global pkgname FreeFileSync %global prog2name RealTimeSync %global dummy_package 0 +%define min_libcurl %{nil} +%define min_libssh2 %{nil} +%define min_openssl %{nil} %define scl_env %{nil} %define scl_buildreq coreutils %if 0%{?el6}%{?el7} %define scl_env devtoolset-7 %define scl_buildreq devtoolset-7-toolchain + %define min_libcurl >= 7.64.0 + %define min_libssh2 >= 1.8.0 + %define min_openssl >= 1.1.0h %endif Name: freefilesync Version: 10.9 @@ -25,14 +26,11 @@ 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_makefile.patch -Patch1: ffs_no_check_updates.patch -Patch2: ffs_no_wx311.patch -Patch3: ffs_fedora.patch -Patch4: ffs_allow_parallel_ops.patch -Patch5: ffs_old_libcurl.patch -Patch6: ffs_sftp.patch -Patch7: ffs_abi.patch +Patch0: ffs_no_check_updates.patch +Patch1: ffs_no_wx311.patch +Patch2: ffs%{?dist}.patch +Patch3: ffs_allow_parallel_ops.patch +Patch4: ffs_sftp.patch Packager: B Stack # WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system. @@ -41,19 +39,18 @@ BuildRequires: compat-wxGTK3-gtk2-devel BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: ImageMagick -BuildRequires: libcurl-devel -BuildRequires: libssh2-devel -BuildRequires: openssl-devel BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(zlib) +BuildRequires: libcurl-devel %{min_libcurl} +BuildRequires: libssh2-devel %{min_libssh2} +BuildRequires: openssl-devel %{min_openssl} %if 0%{?el6}%{?el7} BuildRequires: wxGTK-devel -%endif -%if "%{?scl_env}" != "" BuildRequires: %{scl_buildreq} %endif Requires: hicolor-icon-theme +Requires: xdg-utils %description FreeFileSync is a free Open Source software that helps you synchronize @@ -73,41 +70,13 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 - -%if "%{?scl_env}" != "" - # everything minus the -fPIC got farther but failed asking for -fPIC - # another option is to use the output of "wx-config --libs std, aui --debug=no" from fc28 and find the 3.0 libs and use those here. - %{__sed} \ - -e 's|-O3 -DNDEBUG|& -I/usr/include/wx-3.0-gtk2 -I/usr/lib64/wx/include/gtk2-unicode-3.0-gtk2 -fPIC|;' \ - -e '/LINKFLAGS/s|-no-pie|& -I/usr/include/wx-3.0-gtk2 -I/usr/lib64/wx/include/gtk2-unicode-3.0-gtk2 -pthread -lwx_gtk2u_aui-3.0-gtk2 -lwx_gtk2u_xrc-3.0-gtk2 -lwx_gtk2u_html-3.0-gtk2 -lwx_gtk2u_qa-3.0-gtk2 -lwx_gtk2u_adv-3.0-gtk2 -lwx_gtk2u_core-3.0-gtk2 -lwx_baseu_xml-3.0-gtk2 -lwx_baseu_net-3.0-gtk2 -lwx_baseu-3.0-gtk2|;' \ - -e 's|-O3 -DNDEBUG|-DNDEBUG -D"warn_static(arg)= " -DZEN_LINUX %{optflags}|g' \ - -e '/LINKFLAGS/s|-s|-Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld %{__global_ldflags}|g' \ - -e '/LINKFLAGS/s|LINKLAGS\s*=\s*|&--static |;' \ - -i %{pkgname}/Source/Makefile %{pkgname}/Source/%{prog2name}/Makefile - - # old libcurl problems again, perhaps solved with http://www.city-fan.org/ftp/contrib/yum-repo/rhel7/x86_64/ - #sed -r -e '/CURLE_WEIRD_SERVER_REPLY|CURLE_HTTP2|CURLE_NO_CONNECTION_AVAILABLE|CURLE_SSL_PINNEDPUBKEYNOTMATCH|CURLE_SSL_INVALIDCERTSTATUS|CURLE_RECURSIVE_API_CALL|CURLINFO_ACTIVESOCKET/s|^|//|;' \ - # -i %{pkgname}/Source/fs/libcurl/curl_wrap.h - - # https://stackoverflow.com/questions/52567517/freefilesync-c-error-byte-is-not-a-member-of-std - sed -i '1s/^/#include \n/' zen/serialize.h zen/ring_buffer.h - - # trying to use some openssl-devel from 1.1.0 to satisfy it, from city-fan? - ## use openssl 1.0.2 on centos7 - #sed -r -e '/OPENSSL_VERSION_NUMBER/s|0x[0-9]+L|0x100020beL|;' \ - # -i FreeFileSync/Source/fs/libssh2/*.cpp - -%else -# only when not el6/el7 + # custom build parameters for packaging application in rpm - %{__sed} \ - -e 's|-O3 -DNDEBUG|-DNDEBUG -D"warn_static(arg)= " -DZEN_LINUX %{build_cxxflags}|g' \ - -e '/LINKFLAGS/s|-s|%{__global_ldflags}|g' \ - -i %{pkgname}/Source/Makefile %{pkgname}/Source/%{prog2name}/Makefile -%endif +# fedora provides build_cxxflags, which is really just optflags +%{__sed} \ + -e 's|-O3 -DNDEBUG|-DNDEBUG -D"warn_static(arg)= " -DZEN_LINUX %{?build_cxxflags:%{build_cxxflags}}%{!?build_cxxflags:%{optflags}}|g' \ + -e '/LINKFLAGS/s|-s|%{__global_ldflags}|;' \ + -i %{pkgname}/Source/Makefile %{pkgname}/Source/%{prog2name}/Makefile %build %if !%{dummy_package} @@ -115,8 +84,7 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ scl enable %{scl_env} /bin/bash << EOF %endif %make_build -C %{pkgname}/Source - # turned off while building ffs for centos 7 - #%make_build -C %{pkgname}/Source/%{prog2name} + %make_build -C %{pkgname}/Source/%{prog2name} %if "%{?scl_env}" != "" EOF %endif @@ -129,9 +97,7 @@ EOF #%%make_install -C %%{pkgname}/Source/%%{prog2name} pushd %{pkgname}/Build install -d %{buildroot}%{_bindir} %{buildroot}%{_datadir}/%{name} -# turned off while building ffs for centos 7 -#install -Dm 0755 -t %{buildroot}%{_bindir} Bin/%{pkgname} Bin/%{prog2name} -install -Dm 0755 -t %{buildroot}%{_bindir} Bin/%{pkgname} +install -Dm 0755 -t %{buildroot}%{_bindir} Bin/%{pkgname} Bin/%{prog2name} cp -pr Languages %{buildroot}%{_datadir}/%{name} install -Dm 0644 ding.wav gong.wav harp.wav Resources.zip styles.gtk_rc %{buildroot}%{_datadir}/%{name} popd @@ -194,8 +160,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %license %attr(444, -, -) License.txt %doc %attr(444, -, -) Changelog.txt %{_bindir}/%{pkgname} -# turned off while building ffs for centos 7 -#%{_bindir}/%{prog2name} +%{_bindir}/%{prog2name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*x*/apps/*.png %{_datadir}/%{name} -- cgit From d1870fc18e376333d9095ba55406444d8bc0b163 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 18 Feb 2019 16:06:36 -0500 Subject: WIP: ffs for el7 and fc28 from one spec The el7 version depends on the copr bgstack15/FreeFileSync and the fc28 version should be the same as before, but will need to actually be tested. --- freefilesync/freefilesync.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 6d4caf9..2c3a2e5 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -44,10 +44,14 @@ BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(zlib) BuildRequires: libcurl-devel %{min_libcurl} BuildRequires: libssh2-devel %{min_libssh2} -BuildRequires: openssl-devel %{min_openssl} %if 0%{?el6}%{?el7} BuildRequires: wxGTK-devel BuildRequires: %{scl_buildreq} +BuildRequires: openssl-%{name}-devel %{min_openssl} +Requires: openssl-%{name}-libs %{min_openssl} +%else +BuildRequires: openssl-devel +Build %endif Requires: hicolor-icon-theme Requires: xdg-utils -- cgit From 54392305ba65825a6af17ce07165cf0f981e168c Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 18 Feb 2019 16:16:23 -0500 Subject: WIP: fix typo of Build in buildreqs --- freefilesync/freefilesync.spec | 1 - 1 file changed, 1 deletion(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 2c3a2e5..3779b52 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -51,7 +51,6 @@ BuildRequires: openssl-%{name}-devel %{min_openssl} Requires: openssl-%{name}-libs %{min_openssl} %else BuildRequires: openssl-devel -Build %endif Requires: hicolor-icon-theme Requires: xdg-utils -- cgit From 30ecf0df79156130f5b9fe4c00131d20df17796e Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 18 Feb 2019 21:18:34 -0500 Subject: WIP freefilesync: add requires: libcurl and libssh --- freefilesync/freefilesync.spec | 2 ++ 1 file changed, 2 insertions(+) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 3779b52..fe415fe 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -48,6 +48,8 @@ BuildRequires: libssh2-devel %{min_libssh2} BuildRequires: wxGTK-devel BuildRequires: %{scl_buildreq} BuildRequires: openssl-%{name}-devel %{min_openssl} +Requires: libcurl %{min_libcurl} +Requires: libssh2 %{min_libssh2} Requires: openssl-%{name}-libs %{min_openssl} %else BuildRequires: openssl-devel -- cgit From cd61d610cdcba5b6380d5e1a9561ab53332f8846 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 19 Feb 2019 08:18:07 -0500 Subject: WIP: fix fc28 libcurl problem and el7 %dist --- freefilesync/freefilesync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index fe415fe..169fa08 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -28,7 +28,7 @@ Source1: %{pkgname}.desktop Source2: %{prog2name}.desktop Patch0: ffs_no_check_updates.patch Patch1: ffs_no_wx311.patch -Patch2: ffs%{?dist}.patch +Patch2: ffs.%{?rhel:el%{?rhel}}%{!?rhel:%{?dist}}.patch Patch3: ffs_allow_parallel_ops.patch Patch4: ffs_sftp.patch -- cgit From 94fb96c83a48244fba927e60613492632d8aed56 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 19 Feb 2019 08:29:04 -0500 Subject: fix typo in Patch2 about %dist --- freefilesync/freefilesync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 169fa08..df5661c 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -28,7 +28,7 @@ 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 +Patch2: ffs%{?rhel:.el%{?rhel}}%{!?rhel:%{?dist}}.patch Patch3: ffs_allow_parallel_ops.patch Patch4: ffs_sftp.patch -- cgit From 7cbc853c51d7a202772626410e25158c42364d06 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 19 Feb 2019 09:03:50 -0500 Subject: 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 --- freefilesync/freefilesync.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'freefilesync/freefilesync.spec') 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 # 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 -- cgit From 6724dc5ffea390b518dbef17b6190e049f043493 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 19 Feb 2019 09:07:35 -0500 Subject: fix %fi to %endif --- freefilesync/freefilesync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 2b39407..00aeb2e 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -81,7 +81,7 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %else # use the fedora patch %patch4 -p1 -%fi +%endif # custom build parameters for packaging application in rpm # fedora provides build_cxxflags, which is really just optflags -- cgit From ffb80fb0062f14c9ff58cf157c77e64307cf7def Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 19 Feb 2019 09:49:08 -0500 Subject: FreeFileSync 10.9-2 for CentOS 7 and Fedora 28-30 --- freefilesync/freefilesync.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'freefilesync/freefilesync.spec') diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 00aeb2e..adb5949 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -15,7 +15,7 @@ %endif Name: freefilesync Version: 10.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A file synchronization utility Group: Applications/File -- cgit