diff options
author | B Stack <bgstack15@gmail.com> | 2020-07-23 14:24:41 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2020-07-23 14:24:41 +0000 |
commit | 6182a3a1a339fdbc882c30a01e25c1db7ad7728c (patch) | |
tree | f7f50de0ac3c85e16687014bd7ad37babe75861d /freefilesync/freefilesync.spec | |
parent | Merge branch 'irfanview-bump' into 'master' (diff) | |
parent | fix date for 10.25 (diff) | |
download | stackrpms-6182a3a1a339fdbc882c30a01e25c1db7ad7728c.tar.gz stackrpms-6182a3a1a339fdbc882c30a01e25c1db7ad7728c.tar.bz2 stackrpms-6182a3a1a339fdbc882c30a01e25c1db7ad7728c.zip |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 11.0
See merge request bgstack15/stackrpms!169
Diffstat (limited to 'freefilesync/freefilesync.spec')
-rw-r--r-- | freefilesync/freefilesync.spec | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index afc6c5f..030b863 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -19,7 +19,7 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 10.25 +Version: 11.0 Release: 1%{?dist} Summary: A file synchronization utility @@ -45,8 +45,8 @@ Patch9: ffs_no_eraseif.patch Patch10: revert_zenju_aggressive_upstreamisms.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. -BuildRequires: compat-wxGTK3-gtk2-devel +BuildRequires: brotli-devel +BuildRequires: wxGTK3-devel BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: ImageMagick @@ -57,7 +57,6 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(zlib) %if 0%{?el6}%{?el7} -BuildRequires: wxGTK-devel BuildRequires: %{scl_buildreq} BuildRequires: openssl-%{name}-devel %{min_openssl} Requires: libcurl %{min_libcurl} @@ -112,6 +111,7 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ -i %{pkgname}/Source/Makefile %{pkgname}/Source/%{prog2name}/Makefile %build +export TMPDIR=/tmp # necessary since 11.0 %if !%{dummy_package} %if "%{?scl_env}" != "" scl enable %{scl_env} /bin/bash << 'EOFSCL' @@ -124,6 +124,7 @@ EOFSCL %endif %install +export TMPDIR=/tmp # necessary since 11.0 %if !%{dummy_package} # removed by upstream! #%%make_install -C %%{pkgname}/Source @@ -205,6 +206,15 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Wed Jul 22 2020 B Stack <bgstack15@gmail.com> - 11.0-1 +- version bump +- use gtk3 +- el6,7,8 and fc31 packages are becoming stale + +* Sun Jun 21 2020 B Stack <bgstack15@gmail.com> - 10.25-1 +- version bump +- el6,7,8 and fc31 packages not built because upstream requires g++-10 + * Mon May 18 2020 B Stack <bgstack15@gmail.com> - 10.24-1 - version bump - add revert_zenju_aggressive_upstreamisms.patch |