From 442576575fab0de61c9ca29c6ec104a6c39bf83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 20 May 2019 09:40:23 +0000 Subject: [PATCH 01/13] New upstream version 4.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NVR: wt-4.0.5-1 Signed-off-by: Michal Minář --- .gitignore | 2 +- sources | 2 +- use-system-sqlite.patch | 10 +++++----- ...0.3-PACKAGE-LICENSING => wt-4.0.5-PACKAGE-LICENSING | 0 wt.spec | 7 +++++-- 5 files changed, 12 insertions(+), 9 deletions(-) rename wt-4.0.3-PACKAGE-LICENSING => wt-4.0.5-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 5a1c3e4..7ed034c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.0.3-free.tar.xz +/wt-4.0.5-free.tar.xz diff --git a/sources b/sources index 40315a2..67b5afa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.0.3-free.tar.xz) = 80d9c24bec270692324f1db22618875cb514d7f54a4ce285f3517d98c25798619b9c74bd8e717eb83db43edb6cd2da992ded8629d0d239bfdbc5052d56cb19fa +SHA512 (wt-4.0.5-free.tar.xz) = c46fd59a3cfe288d3ebdd2a40538d8b507583041e505b4df4c21c966be80c1f0c9c631863b4af207c7b46f4074ac0e5da308e97f88b32a32c8dcc2d94d6cc2fb diff --git a/use-system-sqlite.patch b/use-system-sqlite.patch index ec29ff0..6e7e760 100644 --- a/use-system-sqlite.patch +++ b/use-system-sqlite.patch @@ -1,9 +1,9 @@ -Index: wt-3.3.2/src/CMakeLists.txt +Index: wt-4.0.5/src/CMakeLists.txt =================================================================== ---- wt-3.3.2.orig/src/CMakeLists.txt -+++ wt-3.3.2/src/CMakeLists.txt -@@ -5,9 +5,12 @@ INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_SOURCE_DIR} +--- wt-4.0.5.orig/src/CMakeLists.txt ++++ wt-4.0.5/src/CMakeLists.txt +@@ -6,9 +6,12 @@ INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR}/Wt/Date/include ${CMAKE_CURRENT_BINARY_DIR} # for WConfig.h ${BOOST_INCLUDE_DIRS} - Wt/Dbo/backend/amalgamation # for sqlite3.h diff --git a/wt-4.0.3-PACKAGE-LICENSING b/wt-4.0.5-PACKAGE-LICENSING similarity index 100% rename from wt-4.0.3-PACKAGE-LICENSING rename to wt-4.0.5-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index d0f4439..189905a 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 4.0.3 -Release: 4%{?dist} +Version: 4.0.5 +Release: 1%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -280,6 +280,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon May 20 2019 Michal Minář - 4.0.5-1 +- New upstream version 4.0.5 + * Sun Feb 03 2019 Fedora Release Engineering - 4.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 9ca9cf407ea720cb70ab950fc54ce3faf5d5ddd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 20 May 2019 09:40:23 +0000 Subject: [PATCH 02/13] New upstream version 4.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NVR: wt-4.0.5-1 Resolves: bz#1676221 Signed-off-by: Michal Minář --- .gitignore | 2 +- sources | 2 +- use-system-sqlite.patch | 10 +++++----- ...0.3-PACKAGE-LICENSING => wt-4.0.5-PACKAGE-LICENSING | 0 wt.spec | 7 +++++-- 5 files changed, 12 insertions(+), 9 deletions(-) rename wt-4.0.3-PACKAGE-LICENSING => wt-4.0.5-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 5a1c3e4..7ed034c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.0.3-free.tar.xz +/wt-4.0.5-free.tar.xz diff --git a/sources b/sources index 40315a2..67b5afa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.0.3-free.tar.xz) = 80d9c24bec270692324f1db22618875cb514d7f54a4ce285f3517d98c25798619b9c74bd8e717eb83db43edb6cd2da992ded8629d0d239bfdbc5052d56cb19fa +SHA512 (wt-4.0.5-free.tar.xz) = c46fd59a3cfe288d3ebdd2a40538d8b507583041e505b4df4c21c966be80c1f0c9c631863b4af207c7b46f4074ac0e5da308e97f88b32a32c8dcc2d94d6cc2fb diff --git a/use-system-sqlite.patch b/use-system-sqlite.patch index ec29ff0..6e7e760 100644 --- a/use-system-sqlite.patch +++ b/use-system-sqlite.patch @@ -1,9 +1,9 @@ -Index: wt-3.3.2/src/CMakeLists.txt +Index: wt-4.0.5/src/CMakeLists.txt =================================================================== ---- wt-3.3.2.orig/src/CMakeLists.txt -+++ wt-3.3.2/src/CMakeLists.txt -@@ -5,9 +5,12 @@ INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_SOURCE_DIR} +--- wt-4.0.5.orig/src/CMakeLists.txt ++++ wt-4.0.5/src/CMakeLists.txt +@@ -6,9 +6,12 @@ INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR}/Wt/Date/include ${CMAKE_CURRENT_BINARY_DIR} # for WConfig.h ${BOOST_INCLUDE_DIRS} - Wt/Dbo/backend/amalgamation # for sqlite3.h diff --git a/wt-4.0.3-PACKAGE-LICENSING b/wt-4.0.5-PACKAGE-LICENSING similarity index 100% rename from wt-4.0.3-PACKAGE-LICENSING rename to wt-4.0.5-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index d0f4439..189905a 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 4.0.3 -Release: 4%{?dist} +Version: 4.0.5 +Release: 1%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -280,6 +280,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon May 20 2019 Michal Minář - 4.0.5-1 +- New upstream version 4.0.5 + * Sun Feb 03 2019 Fedora Release Engineering - 4.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0006433173ac9ecc6fef6c22113e11c3eac3592f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:46:03 +0000 Subject: [PATCH 03/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 189905a..a8e1436 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -280,6 +280,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 4.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon May 20 2019 Michal Minář - 4.0.5-1 - New upstream version 4.0.5 From 3ec5ccf6eadcf382b155701ccabf911371ff5490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 19 Aug 2019 08:11:09 +0000 Subject: [PATCH 04/13] new upstream version: 4.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NVR: wt-4.1.0-1 Resolves: bz#1742106 Signed-off-by: Michal Minář --- .gitignore | 2 +- find-mysql.patch | 13 ---------- sources | 2 +- ...GE-LICENSING => wt-4.1.0-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 24 ++++++++++++------- wt.spec | 9 +++++-- 6 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 find-mysql.patch rename wt-4.0.5-PACKAGE-LICENSING => wt-4.1.0-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 7ed034c..947ac12 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.0.5-free.tar.xz +/wt-4.1.0-free.tar.xz diff --git a/find-mysql.patch b/find-mysql.patch deleted file mode 100644 index 6ceedf3..0000000 --- a/find-mysql.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: wt-3.3.1-rc1/cmake/WtFindMysql.txt -=================================================================== ---- wt-3.3.1-rc1.orig/cmake/WtFindMysql.txt -+++ wt-3.3.1-rc1/cmake/WtFindMysql.txt -@@ -25,6 +25,8 @@ FIND_LIBRARY(MYSQL_LIB - PATHS - ${MYSQL_PREFIX}/lib - ${MYSQL_PREFIX}/lib/opt -+ ${MYSQL_PREFIX}/lib/mysql -+ ${MYSQL_PREFIX}/lib64/mysql - /usr/lib - /usr/local/lib - /opt/local/lib diff --git a/sources b/sources index 67b5afa..5b3454d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.0.5-free.tar.xz) = c46fd59a3cfe288d3ebdd2a40538d8b507583041e505b4df4c21c966be80c1f0c9c631863b4af207c7b46f4074ac0e5da308e97f88b32a32c8dcc2d94d6cc2fb +SHA512 (wt-4.1.0-free.tar.xz) = 663afdb0c16a2ca1218e3bae73d973c3120112b6f22db4726ff555547b2eaed2a42da8446969db1a2f83ba2c97f9d300da59111018c15bdbb8aed44b078064f1 diff --git a/wt-4.0.5-PACKAGE-LICENSING b/wt-4.1.0-PACKAGE-LICENSING similarity index 100% rename from wt-4.0.5-PACKAGE-LICENSING rename to wt-4.1.0-PACKAGE-LICENSING diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh index dbde0e4..f5f8dbf 100755 --- a/wt-generate-tarball.sh +++ b/wt-generate-tarball.sh @@ -4,16 +4,24 @@ set -euo pipefail IFS=$'\n\t' NAME="wt" -VERSION=$1 +VERSION="$1" tmp=`mktemp -d` -tar -xzvf $VERSION.tar.gz -C $tmp -pushd $tmp -pushd $NAME-$VERSION/src/Wt/Dbo/backend +archiveName="$VERSION.tar.gz" +[[ -f "${archiveName}" ]] || archiveName="$NAME-$VERSION.tar.gz" +if [[ ! -f "${archiveName}" ]]; then + printf 'Could not find source archive %s!\n' "$archiveName" >&2 + exit 1 +fi + +dirName="$NAME-$VERSION" +tar -xzvf "$archiveName" -C "$tmp" +pushd "$tmp" +pushd "$dirName/src/Wt/Dbo/backend" rm -r ibpp popd # backend -rm -r $NAME-$VERSION/resources/jPlayer -tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION +rm -r "$dirName/resources/jPlayer" +tar -cJvf "$dirName-free.tar.xz" "$dirName" popd # tmp -mv $tmp/$NAME-$VERSION-free.tar.xz . -rm -r $tmp +mv "$tmp/$dirName-free.tar.xz" . +rm -r "$tmp" diff --git a/wt.spec b/wt.spec index a8e1436..569c3d2 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 4.0.5 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -29,6 +29,8 @@ Source3: README.fedora Source4: wt-generate-tarball.sh Patch0: use-system-sqlite.patch +# fix for pango 1.44: https://github.com/Pandinosaurus/wt/pull/66 +Patch1: pango-add-harfbuzz-include.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel @@ -280,6 +282,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon Aug 19 2019 Michal Minář - 4.1.0-1 +- New upstream version. + * Sat Jul 27 2019 Fedora Release Engineering - 4.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2feacff2b5324eb9540ce71600ad7fab832d6fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 19 Aug 2019 09:41:56 +0000 Subject: [PATCH 05/13] added missing patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- pango-add-harfbuzz-include.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pango-add-harfbuzz-include.patch diff --git a/pango-add-harfbuzz-include.patch b/pango-add-harfbuzz-include.patch new file mode 100644 index 0000000..72bea9c --- /dev/null +++ b/pango-add-harfbuzz-include.patch @@ -0,0 +1,31 @@ +From 20e552a69e3cf3f1c3e77c9cab05e3ce191c5e3b Mon Sep 17 00:00:00 2001 +From: Roel Standaert +Date: Wed, 14 Aug 2019 12:19:11 +0200 +Subject: [PATCH] Issue #7193: Pango 1.44 fix: add harfbuzz include dir + +--- + cmake/WtFindPangoFt2.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt +index 5dae4cbf7..d64eeeecc 100644 +--- a/cmake/WtFindPangoFt2.txt ++++ b/cmake/WtFindPangoFt2.txt +@@ -14,6 +14,9 @@ FIND_PATH(FT2BUILD_INCLUDE_DIR ft2build.h + FIND_PATH(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h + HINTS ${PC_PANGO_FT2_INCLUDE_DIRS}) + ++FIND_PATH(HARFBUZZ_INCLUDE_DIR hb.h ++ HINTS ${PC_PANGO_FT2_INCLUDE_DIRS}) ++ + FIND_PATH(GLIB2_INCLUDE_DIR glib.h + HINTS ${PC_PANGO_FT2_INCLUDE_DIRS}) + +@@ -40,6 +43,7 @@ SET(PANGO_FT2_INCLUDE_DIRS + ${FT2_INCLUDE_DIR} + ${FT2BUILD_INCLUDE_DIR} + ${FONTCONFIG_INCLUDE_DIR} ++ ${HARFBUZZ_INCLUDE_DIR} + ${GLIB2_INCLUDE_DIR} + ${GLIB2_CONFIG_INCLUDE_DIR}) + From d91064202681314d957e83a636488c41693976bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 19 Aug 2019 08:11:09 +0000 Subject: [PATCH 06/13] new upstream version: 4.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NVR: wt-4.1.0-1 Resolves: bz#1742106 Signed-off-by: Michal Minář --- .gitignore | 2 +- find-mysql.patch | 13 -------- pango-add-harfbuzz-include.patch | 31 +++++++++++++++++++ sources | 2 +- ...GE-LICENSING => wt-4.1.0-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 24 +++++++++----- wt.spec | 7 ++++- 7 files changed, 55 insertions(+), 24 deletions(-) delete mode 100644 find-mysql.patch create mode 100644 pango-add-harfbuzz-include.patch rename wt-4.0.5-PACKAGE-LICENSING => wt-4.1.0-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 7ed034c..947ac12 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.0.5-free.tar.xz +/wt-4.1.0-free.tar.xz diff --git a/find-mysql.patch b/find-mysql.patch deleted file mode 100644 index 6ceedf3..0000000 --- a/find-mysql.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: wt-3.3.1-rc1/cmake/WtFindMysql.txt -=================================================================== ---- wt-3.3.1-rc1.orig/cmake/WtFindMysql.txt -+++ wt-3.3.1-rc1/cmake/WtFindMysql.txt -@@ -25,6 +25,8 @@ FIND_LIBRARY(MYSQL_LIB - PATHS - ${MYSQL_PREFIX}/lib - ${MYSQL_PREFIX}/lib/opt -+ ${MYSQL_PREFIX}/lib/mysql -+ ${MYSQL_PREFIX}/lib64/mysql - /usr/lib - /usr/local/lib - /opt/local/lib diff --git a/pango-add-harfbuzz-include.patch b/pango-add-harfbuzz-include.patch new file mode 100644 index 0000000..72bea9c --- /dev/null +++ b/pango-add-harfbuzz-include.patch @@ -0,0 +1,31 @@ +From 20e552a69e3cf3f1c3e77c9cab05e3ce191c5e3b Mon Sep 17 00:00:00 2001 +From: Roel Standaert +Date: Wed, 14 Aug 2019 12:19:11 +0200 +Subject: [PATCH] Issue #7193: Pango 1.44 fix: add harfbuzz include dir + +--- + cmake/WtFindPangoFt2.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt +index 5dae4cbf7..d64eeeecc 100644 +--- a/cmake/WtFindPangoFt2.txt ++++ b/cmake/WtFindPangoFt2.txt +@@ -14,6 +14,9 @@ FIND_PATH(FT2BUILD_INCLUDE_DIR ft2build.h + FIND_PATH(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h + HINTS ${PC_PANGO_FT2_INCLUDE_DIRS}) + ++FIND_PATH(HARFBUZZ_INCLUDE_DIR hb.h ++ HINTS ${PC_PANGO_FT2_INCLUDE_DIRS}) ++ + FIND_PATH(GLIB2_INCLUDE_DIR glib.h + HINTS ${PC_PANGO_FT2_INCLUDE_DIRS}) + +@@ -40,6 +43,7 @@ SET(PANGO_FT2_INCLUDE_DIRS + ${FT2_INCLUDE_DIR} + ${FT2BUILD_INCLUDE_DIR} + ${FONTCONFIG_INCLUDE_DIR} ++ ${HARFBUZZ_INCLUDE_DIR} + ${GLIB2_INCLUDE_DIR} + ${GLIB2_CONFIG_INCLUDE_DIR}) + diff --git a/sources b/sources index 67b5afa..5b3454d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.0.5-free.tar.xz) = c46fd59a3cfe288d3ebdd2a40538d8b507583041e505b4df4c21c966be80c1f0c9c631863b4af207c7b46f4074ac0e5da308e97f88b32a32c8dcc2d94d6cc2fb +SHA512 (wt-4.1.0-free.tar.xz) = 663afdb0c16a2ca1218e3bae73d973c3120112b6f22db4726ff555547b2eaed2a42da8446969db1a2f83ba2c97f9d300da59111018c15bdbb8aed44b078064f1 diff --git a/wt-4.0.5-PACKAGE-LICENSING b/wt-4.1.0-PACKAGE-LICENSING similarity index 100% rename from wt-4.0.5-PACKAGE-LICENSING rename to wt-4.1.0-PACKAGE-LICENSING diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh index dbde0e4..f5f8dbf 100755 --- a/wt-generate-tarball.sh +++ b/wt-generate-tarball.sh @@ -4,16 +4,24 @@ set -euo pipefail IFS=$'\n\t' NAME="wt" -VERSION=$1 +VERSION="$1" tmp=`mktemp -d` -tar -xzvf $VERSION.tar.gz -C $tmp -pushd $tmp -pushd $NAME-$VERSION/src/Wt/Dbo/backend +archiveName="$VERSION.tar.gz" +[[ -f "${archiveName}" ]] || archiveName="$NAME-$VERSION.tar.gz" +if [[ ! -f "${archiveName}" ]]; then + printf 'Could not find source archive %s!\n' "$archiveName" >&2 + exit 1 +fi + +dirName="$NAME-$VERSION" +tar -xzvf "$archiveName" -C "$tmp" +pushd "$tmp" +pushd "$dirName/src/Wt/Dbo/backend" rm -r ibpp popd # backend -rm -r $NAME-$VERSION/resources/jPlayer -tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION +rm -r "$dirName/resources/jPlayer" +tar -cJvf "$dirName-free.tar.xz" "$dirName" popd # tmp -mv $tmp/$NAME-$VERSION-free.tar.xz . -rm -r $tmp +mv "$tmp/$dirName-free.tar.xz" . +rm -r "$tmp" diff --git a/wt.spec b/wt.spec index 189905a..060e49d 100644 --- a/wt.spec +++ b/wt.spec @@ -5,7 +5,7 @@ %global WTRUNGROUP apache Name: wt -Version: 4.0.5 +Version: 4.1.0 Release: 1%{?dist} Summary: C++ library for developing web applications @@ -29,6 +29,8 @@ Source3: README.fedora Source4: wt-generate-tarball.sh Patch0: use-system-sqlite.patch +# fix for pango 1.44: https://github.com/Pandinosaurus/wt/pull/66 +Patch1: pango-add-harfbuzz-include.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel @@ -280,6 +282,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon Aug 19 2019 Michal Minář - 4.1.0-1 +- New upstream version. + * Mon May 20 2019 Michal Minář - 4.0.5-1 - New upstream version 4.0.5 From 1fededcb8267a2d32573a2e507be0f2e05d3e9c6 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 14 Dec 2019 14:29:08 -0700 Subject: [PATCH 07/13] Add missing #include for gcc-10 --- gcc10.patch | 11 +++++++++++ wt.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gcc10.patch diff --git a/gcc10.patch b/gcc10.patch new file mode 100644 index 0000000..e3a602c --- /dev/null +++ b/gcc10.patch @@ -0,0 +1,11 @@ +diff -rup a/src/Wt/Core/observing_ptr_impl.hpp b/src/Wt/Core/observing_ptr_impl.hpp +--- a/src/Wt/Core/observing_ptr_impl.hpp 2019-07-31 07:07:38.000000000 -0600 ++++ b/src/Wt/Core/observing_ptr_impl.hpp 2019-10-13 09:05:52.032057543 -0600 +@@ -7,6 +7,7 @@ + #ifndef WT_CORE_OBSERVING_PTR_IMPL_H_ + #define WT_CORE_OBSERVING_PTR_IMPL_H_ + ++#include + #include "observable.hpp" + + namespace Wt { namespace Core { diff --git a/wt.spec b/wt.spec index 569c3d2..68042a2 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -31,6 +31,7 @@ Source4: wt-generate-tarball.sh Patch0: use-system-sqlite.patch # fix for pango 1.44: https://github.com/Pandinosaurus/wt/pull/66 Patch1: pango-add-harfbuzz-include.patch +Patch2: gcc10.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel @@ -282,6 +283,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sat Dec 14 2019 Jeff Law - 4.1.0-2 +- Add missing #include for gcc-10 + * Mon Aug 19 2019 Michal Minář - 4.1.0-1 - New upstream version. From 36f0b9481625b49e163d8f274236c396954dc542 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:59:54 +0000 Subject: [PATCH 08/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 68042a2..e4a3464 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -283,6 +283,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 4.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Dec 14 2019 Jeff Law - 4.1.0-2 - Add missing #include for gcc-10 From ac262df76abe39cd60bbdd765924dacec007bbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Tue, 17 Mar 2020 14:19:13 +0000 Subject: [PATCH 09/13] new upstream version: 4.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit set default cipher list to PROFILE=SYSTEM cleanup Signed-off-by: Michal Minář --- .gitignore | 2 +- gcc10.patch | 11 ------- pango-add-harfbuzz-include.patch | 31 ------------------- sources | 2 +- ssl-default-cipher-list.patch | 13 ++++++++ ...GE-LICENSING => wt-4.2.2-PACKAGE-LICENSING | 0 wt.spec | 19 +++++++----- 7 files changed, 26 insertions(+), 52 deletions(-) delete mode 100644 gcc10.patch delete mode 100644 pango-add-harfbuzz-include.patch create mode 100644 ssl-default-cipher-list.patch rename wt-4.1.0-PACKAGE-LICENSING => wt-4.2.2-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 947ac12..28b4750 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.1.0-free.tar.xz +/wt-4.2.2-free.tar.xz diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index e3a602c..0000000 --- a/gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rup a/src/Wt/Core/observing_ptr_impl.hpp b/src/Wt/Core/observing_ptr_impl.hpp ---- a/src/Wt/Core/observing_ptr_impl.hpp 2019-07-31 07:07:38.000000000 -0600 -+++ b/src/Wt/Core/observing_ptr_impl.hpp 2019-10-13 09:05:52.032057543 -0600 -@@ -7,6 +7,7 @@ - #ifndef WT_CORE_OBSERVING_PTR_IMPL_H_ - #define WT_CORE_OBSERVING_PTR_IMPL_H_ - -+#include - #include "observable.hpp" - - namespace Wt { namespace Core { diff --git a/pango-add-harfbuzz-include.patch b/pango-add-harfbuzz-include.patch deleted file mode 100644 index 72bea9c..0000000 --- a/pango-add-harfbuzz-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 20e552a69e3cf3f1c3e77c9cab05e3ce191c5e3b Mon Sep 17 00:00:00 2001 -From: Roel Standaert -Date: Wed, 14 Aug 2019 12:19:11 +0200 -Subject: [PATCH] Issue #7193: Pango 1.44 fix: add harfbuzz include dir - ---- - cmake/WtFindPangoFt2.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt -index 5dae4cbf7..d64eeeecc 100644 ---- a/cmake/WtFindPangoFt2.txt -+++ b/cmake/WtFindPangoFt2.txt -@@ -14,6 +14,9 @@ FIND_PATH(FT2BUILD_INCLUDE_DIR ft2build.h - FIND_PATH(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h - HINTS ${PC_PANGO_FT2_INCLUDE_DIRS}) - -+FIND_PATH(HARFBUZZ_INCLUDE_DIR hb.h -+ HINTS ${PC_PANGO_FT2_INCLUDE_DIRS}) -+ - FIND_PATH(GLIB2_INCLUDE_DIR glib.h - HINTS ${PC_PANGO_FT2_INCLUDE_DIRS}) - -@@ -40,6 +43,7 @@ SET(PANGO_FT2_INCLUDE_DIRS - ${FT2_INCLUDE_DIR} - ${FT2BUILD_INCLUDE_DIR} - ${FONTCONFIG_INCLUDE_DIR} -+ ${HARFBUZZ_INCLUDE_DIR} - ${GLIB2_INCLUDE_DIR} - ${GLIB2_CONFIG_INCLUDE_DIR}) - diff --git a/sources b/sources index 5b3454d..732f963 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.1.0-free.tar.xz) = 663afdb0c16a2ca1218e3bae73d973c3120112b6f22db4726ff555547b2eaed2a42da8446969db1a2f83ba2c97f9d300da59111018c15bdbb8aed44b078064f1 +SHA512 (wt-4.2.2-free.tar.xz) = 79fd49b54f6e9c38b3949807d7b9b6fff86258fe3aa0076673c88aa32b1ce7d5610855e8245ba03e0c5c04f8c6cf2d4f205cf76aab19b085fa0fe7246e419110 diff --git a/ssl-default-cipher-list.patch b/ssl-default-cipher-list.patch new file mode 100644 index 0000000..9578a96 --- /dev/null +++ b/ssl-default-cipher-list.patch @@ -0,0 +1,13 @@ +Index: wt-4.2.2/src/http/Configuration.C +=================================================================== +--- wt-4.2.2.orig/src/http/Configuration.C ++++ wt-4.2.2/src/http/Configuration.C +@@ -58,7 +58,7 @@ Configuration::Configuration(Wt::WLogger + sslClientVerification_("none"), + sslVerifyDepth_(1), + sslCaCertificates_(), +- sslCipherList_(), ++ sslCipherList_("PROFILE=SYSTEM"), + sslPreferServerCiphers_(false), + sessionIdPrefix_(), + accessLog_(), diff --git a/wt-4.1.0-PACKAGE-LICENSING b/wt-4.2.2-PACKAGE-LICENSING similarity index 100% rename from wt-4.1.0-PACKAGE-LICENSING rename to wt-4.2.2-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index e4a3464..1f20f6d 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 4.1.0 -Release: 3%{?dist} +Version: 4.2.2 +Release: 1%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -29,13 +29,11 @@ Source3: README.fedora Source4: wt-generate-tarball.sh Patch0: use-system-sqlite.patch -# fix for pango 1.44: https://github.com/Pandinosaurus/wt/pull/66 -Patch1: pango-add-harfbuzz-include.patch -Patch2: gcc10.patch +Patch1: ssl-default-cipher-list.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel -BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel qt-devel +BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel qt5-devel # Don't use bundled glew on fedora >= 21 %if 0%{?fedora} >= 21 @@ -89,8 +87,9 @@ applications using the Wt toolkit and the Wt::Dbo ORM library. %package examples Summary: Examples for Wt License: GPLv2 and MIT -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-dbo%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-dbo%{?_isa} = %{version}-%{release} +Requires: %{name}-files{?_isa} = %{version}-%{release} %description examples This package contains programming examples distributed with official Wt @@ -281,8 +280,12 @@ popd %{_defaultdocdir}/%{name}-doc/reference/* %{_defaultdocdir}/%{name}-doc/tutorial/* %{_defaultdocdir}/%{name}-doc/examples/* +%{_defaultdocdir}/%{name}-doc/*.dox %changelog +* Tue Mar 17 2020 Michal Minář - 4.2.2-1 +- New upstream version 4.2.2 + * Fri Jan 31 2020 Fedora Release Engineering - 4.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 513361883df12a188a3cc034c5bcf40d6f18f005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Fri, 20 Mar 2020 04:07:14 +0000 Subject: [PATCH 10/13] fixed -examples dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- wt.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wt.spec b/wt.spec index 1f20f6d..d9ee365 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -89,7 +89,6 @@ Summary: Examples for Wt License: GPLv2 and MIT Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-dbo%{?_isa} = %{version}-%{release} -Requires: %{name}-files{?_isa} = %{version}-%{release} %description examples This package contains programming examples distributed with official Wt @@ -283,6 +282,9 @@ popd %{_defaultdocdir}/%{name}-doc/*.dox %changelog +* Fri Mar 20 2020 Michal Minář - 4.2.2-2 +- Fixed -examples' dependencies + * Tue Mar 17 2020 Michal Minář - 4.2.2-1 - New upstream version 4.2.2 From dd19ab9e603ea9f3dbf8392cfe59958ca62423cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Thu, 26 Mar 2020 17:08:17 +0000 Subject: [PATCH 11/13] new upstream version 4.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- .gitignore | 2 +- sources | 2 +- wt-4.2.2-PACKAGE-LICENSING => wt-4.3.0-PACKAGE-LICENSING | 0 wt.spec | 7 +++++-- 4 files changed, 7 insertions(+), 4 deletions(-) rename wt-4.2.2-PACKAGE-LICENSING => wt-4.3.0-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 28b4750..5b06a1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.2.2-free.tar.xz +/wt-4.3.0-free.tar.xz diff --git a/sources b/sources index 732f963..d066df5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.2.2-free.tar.xz) = 79fd49b54f6e9c38b3949807d7b9b6fff86258fe3aa0076673c88aa32b1ce7d5610855e8245ba03e0c5c04f8c6cf2d4f205cf76aab19b085fa0fe7246e419110 +SHA512 (wt-4.3.0-free.tar.xz) = ea2d2b1addb14656505b73d126b20308161ce7675cf73ff1e1271a3cfd17b4ef7302f59fb459a0302d35a42aa1a67dd7784d8b4df057d1df3e3e864ceb1ebf8e diff --git a/wt-4.2.2-PACKAGE-LICENSING b/wt-4.3.0-PACKAGE-LICENSING similarity index 100% rename from wt-4.2.2-PACKAGE-LICENSING rename to wt-4.3.0-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index d9ee365..4bf13e4 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -282,6 +282,9 @@ popd %{_defaultdocdir}/%{name}-doc/*.dox %changelog +* Thu Mar 26 2020 Michal Minář - 4.3.0-1 +- New upstream version 4.3.0 + * Fri Mar 20 2020 Michal Minář - 4.2.2-2 - Fixed -examples' dependencies From c7b404be561feaf909409c8a4d621cf96ae2dbae Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 15 Jun 2020 13:33:24 +0100 Subject: [PATCH 12/13] Replace BuildRequires: qt5-devel with qt5-qtbase-devel --- wt.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wt.spec b/wt.spec index 4bf13e4..ac449fa 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -33,7 +33,8 @@ Patch1: ssl-default-cipher-list.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel -BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel qt5-devel +BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel +BuildRequires: qt5-qtbase-devel # Don't use bundled glew on fedora >= 21 %if 0%{?fedora} >= 21 @@ -282,6 +283,9 @@ popd %{_defaultdocdir}/%{name}-doc/*.dox %changelog +* Mon Jun 15 2020 Jonathan Wakely - 4.3.0-2 +- Replace BuildRequires: qt5-devel with qt5-qtbase-devel + * Thu Mar 26 2020 Michal Minář - 4.3.0-1 - New upstream version 4.3.0 From b510a06a00fbfc7741a832ac4c14304ed080d3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Jul 2020 10:22:56 +0200 Subject: [PATCH 13/13] Orphaned for 6+ weeks --- .gitignore | 1 - README.fedora | 21 -- dead.package | 1 + sources | 1 - ssl-default-cipher-list.patch | 13 - timezone-README.fedora | 3 - use-system-sqlite.patch | 18 -- wt-4.3.0-PACKAGE-LICENSING | 17 -- wt-generate-tarball.sh | 27 -- wt.spec | 471 ---------------------------------- 10 files changed, 1 insertion(+), 572 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.fedora create mode 100644 dead.package delete mode 100644 sources delete mode 100644 ssl-default-cipher-list.patch delete mode 100644 timezone-README.fedora delete mode 100644 use-system-sqlite.patch delete mode 100644 wt-4.3.0-PACKAGE-LICENSING delete mode 100755 wt-generate-tarball.sh delete mode 100644 wt.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5b06a1f..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/wt-4.3.0-free.tar.xz diff --git a/README.fedora b/README.fedora deleted file mode 100644 index d8f2c52..0000000 --- a/README.fedora +++ /dev/null @@ -1,21 +0,0 @@ -======================================================================== -User Information for the Fedora wt package -======================================================================== - -Wt source package includes some thrid-party components which can not be -distributed with source rpm package in Fedora. One such component is a -JavaScript widget jPlayer available at: - - http://www.jplayer.org/ - -This script is needed by Wt::WMediaPlayer widget. To make it work, you -need to manually download jPlayer and install its static files into - - /usr/share/Wt/resources/jPlayer/ - -Or you may copy the contents of /usr/share/Wt/resources to your deployment -directory and install there jPlayer when needed. - -To read more about this change, see the: - - https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index d066df5..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (wt-4.3.0-free.tar.xz) = ea2d2b1addb14656505b73d126b20308161ce7675cf73ff1e1271a3cfd17b4ef7302f59fb459a0302d35a42aa1a67dd7784d8b4df057d1df3e3e864ceb1ebf8e diff --git a/ssl-default-cipher-list.patch b/ssl-default-cipher-list.patch deleted file mode 100644 index 9578a96..0000000 --- a/ssl-default-cipher-list.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: wt-4.2.2/src/http/Configuration.C -=================================================================== ---- wt-4.2.2.orig/src/http/Configuration.C -+++ wt-4.2.2/src/http/Configuration.C -@@ -58,7 +58,7 @@ Configuration::Configuration(Wt::WLogger - sslClientVerification_("none"), - sslVerifyDepth_(1), - sslCaCertificates_(), -- sslCipherList_(), -+ sslCipherList_("PROFILE=SYSTEM"), - sslPreferServerCiphers_(false), - sessionIdPrefix_(), - accessLog_(), diff --git a/timezone-README.fedora b/timezone-README.fedora deleted file mode 100644 index 6fca520..0000000 --- a/timezone-README.fedora +++ /dev/null @@ -1,3 +0,0 @@ -This example is named *locale* in source archive. It is renamed in the process -of package build in order to prevent build failures due to a conflict between -header file resulting base script with the same name. diff --git a/use-system-sqlite.patch b/use-system-sqlite.patch deleted file mode 100644 index 6e7e760..0000000 --- a/use-system-sqlite.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: wt-4.0.5/src/CMakeLists.txt -=================================================================== ---- wt-4.0.5.orig/src/CMakeLists.txt -+++ wt-4.0.5/src/CMakeLists.txt -@@ -6,9 +6,12 @@ INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_SOURCE_DIR}/Wt/Date/include - ${CMAKE_CURRENT_BINARY_DIR} # for WConfig.h - ${BOOST_INCLUDE_DIRS} -- Wt/Dbo/backend/amalgamation # for sqlite3.h - ) - -+IF(ENABLE_SQLITE AND NOT USE_SYSTEM_SQLITE3) -+ INCLUDE_DIRECTORIES(Wt/Dbo/backend/amalgamation) # sqlite 3 -+ENDIF(ENABLE_SQLITE AND NOT USE_SYSTEM_SQLITE3) -+ - LINK_DIRECTORIES(${BOOST_LIB_DIRS}) - - MACRO (FILE_TO_STRING infile outfile var) diff --git a/wt-4.3.0-PACKAGE-LICENSING b/wt-4.3.0-PACKAGE-LICENSING deleted file mode 100644 index 6af2c1b..0000000 --- a/wt-4.3.0-PACKAGE-LICENSING +++ /dev/null @@ -1,17 +0,0 @@ -The entire source code is GPLv2 except for these files: - * Boost Software License (BSL v1.0) - * src/http/* - * src/web/random_device.cpp - * src/rapidxml/* (dual licensed with MIT/X11 (BSD like)) - * MIT/X11 (BSD like) - * examples/wtwithqt/* - * BSD - * src/Wt/Auth/passwdqc.h - * src/Wt/Auth/passwdqc_check.h - * zlib/libpng - * src/web/md5.[ch] - * src/web/base64.h - * SIL OFL 1.1 - * resources/font-awesome/font/* - * MIT License - * resources/font-awesome/css/* diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh deleted file mode 100755 index f5f8dbf..0000000 --- a/wt-generate-tarball.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -set -euo pipefail -IFS=$'\n\t' - -NAME="wt" -VERSION="$1" - -tmp=`mktemp -d` -archiveName="$VERSION.tar.gz" -[[ -f "${archiveName}" ]] || archiveName="$NAME-$VERSION.tar.gz" -if [[ ! -f "${archiveName}" ]]; then - printf 'Could not find source archive %s!\n' "$archiveName" >&2 - exit 1 -fi - -dirName="$NAME-$VERSION" -tar -xzvf "$archiveName" -C "$tmp" -pushd "$tmp" -pushd "$dirName/src/Wt/Dbo/backend" -rm -r ibpp -popd # backend -rm -r "$dirName/resources/jPlayer" -tar -cJvf "$dirName-free.tar.xz" "$dirName" -popd # tmp -mv "$tmp/$dirName-free.tar.xz" . -rm -r "$tmp" diff --git a/wt.spec b/wt.spec deleted file mode 100644 index ac449fa..0000000 --- a/wt.spec +++ /dev/null @@ -1,471 +0,0 @@ -%global WTSRVDIR /var/spool/wt -%global WTRUNDIR %{WTSRVDIR}/run - -%global WTRUNUSER apache -%global WTRUNGROUP apache - -Name: wt -Version: 4.3.0 -Release: 2%{?dist} -Summary: C++ library for developing web applications - -# For a breakdown of the licensing, see PACKAGE-LICENSING -License: GPLv2 and Boost and MIT and (Boost or MIT) and BSD and zlib -URL: https://www.webtoolkit.eu/wt -# Following archive was made from upstream tarball downloaded from -# https://github.com/kdeforche/wt/archive/3.3.7.tar.gz -# by running ./wt-generate-tarball.sh 3.3.7 from tarball's directory -Source0: %{name}-%{version}-free.tar.xz -Source1: %{name}-%{version}-PACKAGE-LICENSING -# Explain why the locale example is renamed to timezone. -Source2: timezone-README.fedora -# Explain why the jPlayer static files are missing. -Source3: README.fedora -# wt toolkit contains bundled non-free library (IBPP) that we cannot ship. -# Therefore we use this script to remove its code before shipping it. -# Download the upstream tarball and invoke this script while in the -# tarball's directory: -# ./wt-generate-tarball.sh UPSTREAM_VERSION -Source4: wt-generate-tarball.sh - -Patch0: use-system-sqlite.patch -Patch1: ssl-default-cipher-list.patch - -BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen -BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel -BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel -BuildRequires: qt5-qtbase-devel - -# Don't use bundled glew on fedora >= 21 -%if 0%{?fedora} >= 21 -%global use_system_glew 1 -BuildRequires: glew-devel -%endif - -# Denote the fact of bundling glew -%{!?use_system_glew:Provides: bundled(glew) = 1.10.0} - -%description -Web C++ library with widget oriented API that uses well-tested patterns of -desktop GUI development tailored to the web. To the developer, it offers -abstraction of web-specific implementation details, including client-server -protocols, event handling, graphics support, graceful degradation (or -progressive enhancement), and URL handling. - -%package dbo -Summary: Wt::Dbo ORM library and Sqlite3 back-end - -%description dbo -This package contains the Wt::Dbo Object-Relational Mapping library -and Sqlite3 back-end of it. - -%package dbo-mysql -Summary: MySQL back-end for the Wt::Dbo ORM library -Requires: %{name}-dbo%{?_isa} = %{version}-%{release} - -%description dbo-mysql -This package contains the MySQL back-end for the Wt::Dbo ORM library. - -%package dbo-postgres -Summary: PostgreSQL back-end for the Wt::Dbo ORM library -Requires: %{name}-dbo%{?_isa} = %{version}-%{release} - -%description dbo-postgres -This package contains the PostgresSQL back-end for the Wt::Dbo ORM library. - -%package devel -Summary: Libraries and header files for witty web development -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-dbo%{?_isa} = %{version}-%{release} -Requires: %{name}-dbo-postgres%{?_isa} = %{version}-%{release} -Requires: %{name}-dbo-mysql%{?_isa} = %{version}-%{release} -Requires: cmake - -%description devel -This package contains the files necessary to develop -applications using the Wt toolkit and the Wt::Dbo ORM library. - -%package examples -Summary: Examples for Wt -License: GPLv2 and MIT -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-dbo%{?_isa} = %{version}-%{release} - -%description examples -This package contains programming examples distributed with official Wt -release. - -%package doc -Summary: Documents for the Wt toolkit -# Unfortunately there are differences in doxygen output between arm and other -# architectures. -#BuildArch: noarch - -%description doc -This package contains the documents for Wt API and examples. - -%prep -%autosetup -p1 - -# static files like javascript and css should not be executable -for d in src resources examples; do - find $d -type f \( -iregex '.*\.\([hc]\|js\|css\)' -o -executable \) | \ - xargs -r chmod -v 0644 -done -# locale script created in build directory causes build to fail because some -# dependent headers try to include header which is found in current -# directory. Let's rename it to timezone. -mv examples/feature/locale examples/feature/timezone -mv examples/feature/timezone/{locale,timezone}.C -sed -i 's/locale/timezone/g' \ - examples/feature/CMakeLists.txt \ - examples/feature/timezone/CMakeLists.txt - -find examples -type f -name .htaccess | while read f; do - mv -v $f `dirname $f`/htaccess -done -# conversion to UTF-8 -convdir=`mktemp -d` -for f in examples/style/CornerImage.h; do - tmpf=${convdir}/`basename $f` - iconv -f iso-8859-2 -t UTF-8 $f >$tmpf - mv $tmpf $f -done -rmdir $convdir - -# Make sure not to be using bundled glew -%{?use_system_glew:rm -rf src/3rdparty/glew-1.10.0} - -%build -mkdir wt-build -cd wt-build -## wtdbofirebird library bundles IBPP c++ client library for firebird -## that is licensed under IBPP License, which is marked as Non-Free -## by Red Hat Legal -## let's not package it, until licensing issues are solved -%cmake .. \ - -DCONNECTOR_HTTP=ON \ - -DCONNECTOR_FCGI=ON \ - -DUSE_SYSTEM_SQLITE3=ON \ - -DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick \ - -DWEBUSER="%{WTRUNUSER}" \ - -DWEBGROUP="%{WTRUNGROUP}" \ - -DRUNDIR="%{WTRUNDIR}" \ - -DCONFIGDIR="%{_sysconfdir}/%{name}" \ - -DENABLE_FIREBIRD=OFF \ - -DENABLE_MYSQL=ON \ - %{?use_system_glew:-DUSE_SYSTEM_GLEW=1} \ - -DBUILD_EXAMPLES=ON \ - -DINSTALL_EXAMPLES=ON \ - -DEXAMPLES_DESTINATION=%{_lib}/Wt/examples -make %{?_smp_mflags} -make doc - -%install -pushd wt-build -make install DESTDIR=${RPM_BUILD_ROOT} -install -v -m 0755 -d ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} -cp -v wt_config.xml ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} - -# makes an absolute symlink to resources directory -make_rsc_link() { - ln -vs "%{_datadir}/Wt/resources" \ - "${RPM_BUILD_ROOT}%{_libdir}/Wt/examples/$1" -} - -# installation of examples -pushd examples -for d in `find . -maxdepth 1 -mindepth 1 -type d | \ - grep -v '^\(CMakeFiles\|feature\)$'`; do - # create a symlink for each example pointing on resources dir - make_rsc_link $d -done -for d in `find feature -maxdepth 1 -mindepth 1 -type d | grep -v 'CMakeFiles'`; -do # create a symlink for each feature example pointing on resources dir - make_rsc_link $d -done -popd # examples -popd # wt-build -install -vm 644 %{SOURCE2} \ - ${RPM_BUILD_ROOT}%{_libdir}/Wt/examples/feature/timezone/README.fedora - -# installation of documentation -for d in %{name} %{name}-dbo %{name}-doc; do - install -v -m 0755 -d ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d/ - cp -v LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d/ - install -vm 644 %{SOURCE1} \ - ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d/PACKAGE-LICENSING -done -cp -vr README.md %{SOURCE3} ReleaseNotes.html Changelog \ - ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}/ -cp -vr INSTALL*.html doc/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc/ - -pushd ${RPM_BUILD_ROOT} -mkdir -vp .%{WTSRVDIR} -mkdir -vp .%{WTRUNDIR} - -# cleanup -for d in examples reference; do - if [[ -e .%{_defaultdocdir}/%{name}-doc/$d/html/installdox ]]; then - rm -v .%{_defaultdocdir}/%{name}-doc/$d/html/installdox - fi -done -rm -v .%{_defaultdocdir}/%{name}-doc/main -find .%{_libdir}/Wt/examples -regex '.*/\(CMakeFiles\|.*\.cmake\|Doxygen\)' | \ - xargs rm -rfv -# these scripts were used to generate pictures -find .%{_datadir}/Wt/resources -name 'generate.sh' | xargs rm -v -popd - -%ldconfig_scriptlets -%ldconfig_scriptlets dbo -%ldconfig_scriptlets dbo-mysql -%ldconfig_scriptlets dbo-postgres - -%files -%config(noreplace) %{_sysconfdir}/%{name}/wt_config.xml -%{_libdir}/libwt.so.* -%{_libdir}/libwtfcgi.so.* -%{_libdir}/libwthttp.so.* -%{_libdir}/libwttest.so.* -%dir %{_defaultdocdir}/%{name} -%doc %{_defaultdocdir}/%{name}/README.md -%doc %{_defaultdocdir}/%{name}/README.fedora -%doc %{_defaultdocdir}/%{name}/LICENSE -%doc %{_defaultdocdir}/%{name}/ReleaseNotes.html -%doc %{_defaultdocdir}/%{name}/Changelog -%doc %{_defaultdocdir}/%{name}/PACKAGE-LICENSING -%dir %{_datadir}/Wt -%dir %{_datadir}/Wt/resources -%{_datadir}/Wt/resources/* -%dir %{WTSRVDIR} -%dir %{WTRUNDIR} - -%files dbo -%dir %{_defaultdocdir}/%{name}-dbo -%doc %{_defaultdocdir}/%{name}-dbo/LICENSE -%doc %{_defaultdocdir}/%{name}-dbo/PACKAGE-LICENSING -%{_libdir}/libwtdbo.so.* -%{_libdir}/libwtdbosqlite3.so.* - -%files dbo-mysql -%{_libdir}/libwtdbomysql.so.* - -%files dbo-postgres -%{_libdir}/libwtdbopostgres.so.* - -%files devel -# header files -%dir %{_includedir}/Wt -%{_includedir}/Wt/* -%{_libdir}/*.so -%dir %{_libdir}/cmake/wt -%{_libdir}/cmake/wt/*.cmake - -%files examples -%dir %{_libdir}/Wt -%dir %{_libdir}/Wt/examples -%{_libdir}/Wt/examples/* - -%files doc -%dir %{_defaultdocdir}/%{name}-doc -%doc %{_defaultdocdir}/%{name}-doc/LICENSE -%doc %{_defaultdocdir}/%{name}-doc/PACKAGE-LICENSING -%{_defaultdocdir}/%{name}-doc/*.html -%dir %{_defaultdocdir}/%{name}-doc/images -%dir %{_defaultdocdir}/%{name}-doc/reference -%dir %{_defaultdocdir}/%{name}-doc/tutorial -%dir %{_defaultdocdir}/%{name}-doc/examples -%{_defaultdocdir}/%{name}-doc/images/* -%{_defaultdocdir}/%{name}-doc/reference/* -%{_defaultdocdir}/%{name}-doc/tutorial/* -%{_defaultdocdir}/%{name}-doc/examples/* -%{_defaultdocdir}/%{name}-doc/*.dox - -%changelog -* Mon Jun 15 2020 Jonathan Wakely - 4.3.0-2 -- Replace BuildRequires: qt5-devel with qt5-qtbase-devel - -* Thu Mar 26 2020 Michal Minář - 4.3.0-1 -- New upstream version 4.3.0 - -* Fri Mar 20 2020 Michal Minář - 4.2.2-2 -- Fixed -examples' dependencies - -* Tue Mar 17 2020 Michal Minář - 4.2.2-1 -- New upstream version 4.2.2 - -* Fri Jan 31 2020 Fedora Release Engineering - 4.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Dec 14 2019 Jeff Law - 4.1.0-2 -- Add missing #include for gcc-10 - -* Mon Aug 19 2019 Michal Minář - 4.1.0-1 -- New upstream version. - -* Sat Jul 27 2019 Fedora Release Engineering - 4.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon May 20 2019 Michal Minář - 4.0.5-1 -- New upstream version 4.0.5 - -* Sun Feb 03 2019 Fedora Release Engineering - 4.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Björn Esser - 4.0.3-3 -- Rebuilt for libcrypt.so.2 (#1666033) - -* Thu Aug 23 2018 Nicolas Chauvet - 4.0.3-2 -- Rebuilt for glew 2.1.0 - -* Mon Jul 23 2018 - 4.0.3-1 -- New upstream version 4.0.3 - -* Sat Jul 14 2018 Fedora Release Engineering - 4.0.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Mar 15 2018 Michal Minář - 4.0.2-3 -- New upstream version 4.0.2 -- Compatibility fix for boost 1.66 -- Depend on mariadb-connector-c-devel - -* Fri Feb 09 2018 Fedora Release Engineering - 3.3.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Björn Esser - 3.3.7-6 -- Rebuilt for switch to libxcrypt - -* Thu Aug 03 2017 Fedora Release Engineering - 3.3.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.3.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Jul 23 2017 Björn Esser - 3.3.7-3 -- Rebuilt for Boost 1.64 - -* Mon May 15 2017 Fedora Release Engineering - 3.3.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Sun Apr 23 2017 Michal Minar 3.3.7-1 -- New upstream version 3.3.7 - -* Sat Feb 11 2017 Fedora Release Engineering - 3.3.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 10 2017 Orion Poplawski - 3.3.6-2 -- Rebuild for glew 2.0.0 - -* Mon Aug 08 2016 Michal Minar 3.3.6-1 -- New upstream version 3.3.6 - -* Tue May 17 2016 Jonathan Wakely - 3.3.5-0.6.rc2 -- Rebuilt for linker errors in boost (#1331983) - -* Fri Feb 05 2016 Fedora Release Engineering - 3.3.5-0.5.rc2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 16 2016 Jonathan Wakely - 3.3.5-0.4.rc2 -- Rebuilt for Boost 1.60 - -* Thu Jan 14 2016 Adam Jackson - 3.3.5-0.3.rc2 -- Rebuild for glew 1.13 - -* Wed Nov 18 2015 Michal Minar 3.3.5-0.2.rc2 -- Made doc package archfull. - -* Wed Nov 18 2015 Michal Minar 3.3.5-0.1.rc2 -- New upstream version 3.3.5-rc2 - -* Thu Aug 27 2015 Jonathan Wakely - 3.3.4-6 -- Rebuilt for Boost 1.59 - -* Thu Aug 27 2015 Jonathan Wakely - 3.3.4-5 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 3.3.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 3.3.4-3 -- rebuild for Boost 1.58 - -* Fri Jun 19 2015 Fedora Release Engineering - 3.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 20 2015 Michal Minar 3.3.4-1 -- New upstream version 3.3.4 - -* Mon Feb 09 2015 Ralf Corsépius - 3.3.3-4 -- Add wt-3.3.3-boost-1.57.patch (Fix boost-1.57 FTBFS). -- Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel. -- Unbundle GLEW. - -* Mon Aug 18 2014 Fedora Release Engineering - 3.3.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 13 2014 Michal Minar 3.3.3-2 -- Reenabled raster image support. - -* Wed Jun 11 2014 Michal Minar 3.3.3-1 -- New upstream version 3.3.3. - -* Sun Jun 08 2014 Fedora Release Engineering - 3.3.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 David Tardon - 3.3.2-3 -- rebuild for boost 1.55.0 - -* Fri Mar 21 2014 Michal Minar 3.3.2-2 -- Got rid of bundled sqlite libraries. - -* Fri Mar 14 2014 Michal Minar 3.3.2-1 -- Update to 3.3.2 - -* Sun Sep 22 2013 Michal Minar 3.3.1-0.1.rc1 -- Update to 3.3.1-rc1. -- Added dbo-mysql subpackage with MySQL backend library. -- Unversioned doc directories. - -* Sun Aug 04 2013 Fedora Release Engineering - 3.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jul 27 2013 pmachata@redhat.com - 3.3.0-3 -- Rebuild for boost 1.54.0 - -* Wed Jun 26 2013 Michal Minar 3.3.0-2 -- Using LZMA2 compression for source archive. - -* Thu Jun 20 2013 Michal Minar 3.3.0-1 -- Version 3.3.0 - -* Sat Feb 09 2013 Denis Arnaud - 3.2.3-2 -- Rebuild for Boost-1.53.0 - -* Wed Dec 26 2012 Michal Minar - 3.2.3-1 -- Version 3.2.3 - -* Mon Dec 24 2012 Rex Dieter 3.2.2-7.p1 -- rebuild (GraphicsMagick) - -* Thu Sep 13 2012 Michal Minar - 3.2.2-6.p1 -- fixed changelog line - -* Wed Sep 12 2012 Michal Minar - 3.2.2-5.p1 -- Added wt-generate-tarball.sh script for source tarball generation - from upstream tarball, in order to remove the IBPP non-free library - from source. - -* Mon Sep 03 2012 Michal Minar - 3.2.2-4.p1 -- separated doc dirs for independent subpackages -dbo and -doc - -* Fri Aug 24 2012 Michal Minar - 3.2.2-3.p1 -- Own examples directory. -- Include a copy of license in wt-doc. -- Added License tag for wt-examples. - -* Fri Aug 24 2012 Michal Minar - 3.2.2-2.p1 -- Not packaging back-end due to licensing issues. - -* Tue Aug 21 2012 Michal Minar - 3.2.2-1.p1 -- Initial Package for FE.