From 537f74a349cc2d0de418c41a65d6ca8f1b5d0724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 8 Aug 2016 13:22:00 +0200 Subject: [PATCH 1/3] New upstream version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NV: wt-3.3.6 Signed-off-by: Michal Minář --- .gitignore | 2 +- fix-narrowing-issue-on-arm.patch | 42 ------------------- sources | 2 +- ...GE-LICENSING => wt-3.3.6-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 5 ++- wt.spec | 19 ++++----- 6 files changed, 15 insertions(+), 55 deletions(-) delete mode 100644 fix-narrowing-issue-on-arm.patch rename wt-3.3.5-PACKAGE-LICENSING => wt-3.3.6-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 4f0cd24..969a17d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-3.3.5-rc2-free.tar.xz +/wt-3.3.6-free.tar.xz diff --git a/fix-narrowing-issue-on-arm.patch b/fix-narrowing-issue-on-arm.patch deleted file mode 100644 index 1a489b4..0000000 --- a/fix-narrowing-issue-on-arm.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: wt-3.3.5-rc2/src/web/base64.cpp -=================================================================== ---- wt-3.3.5-rc2.orig/src/web/base64.cpp -+++ wt-3.3.5-rc2/src/web/base64.cpp -@@ -18,24 +18,26 @@ namespace base64 - const char* to_table_end = - _to_table + sizeof(_to_table); - -+ const char _o = (char)(-1); -+ - const char _from_table[128] = - { -- -1, -1, -1, -1, -1, -1, -1, -1, // 0 -- -1, -1, -1, -1, -1, -1, -1, -1, // 8 -- -1, -1, -1, -1, -1, -1, -1, -1, // 16 -- -1, -1, -1, -1, -1, -1, -1, -1, // 24 -- -1, -1, -1, -1, -1, -1, -1, -1, // 32 -- -1, -1, -1, 62, -1, -1, -1, 63, // 40 -+ _o, _o, _o, _o, _o, _o, _o, _o, // 0 -+ _o, _o, _o, _o, _o, _o, _o, _o, // 8 -+ _o, _o, _o, _o, _o, _o, _o, _o, // 16 -+ _o, _o, _o, _o, _o, _o, _o, _o, // 24 -+ _o, _o, _o, _o, _o, _o, _o, _o, // 32 -+ _o, _o, _o, 62, _o, _o, _o, 63, // 40 - 52, 53, 54, 55, 56, 57, 58, 59, // 48 -- 60, 61, -1, -1, -1, 0, -1, -1, // 56 -- -1, 0, 1, 2, 3, 4, 5, 6, // 64 -+ 60, 61, _o, _o, _o, 0, _o, _o, // 56 -+ _o, 0, 1, 2, 3, 4, 5, 6, // 64 - 7, 8, 9, 10, 11, 12, 13, 14, // 72 - 15, 16, 17, 18, 19, 20, 21, 22, // 80 -- 23, 24, 25, -1, -1, -1, -1, -1, // 88 -- -1, 26, 27, 28, 29, 30, 31, 32, // 96 -+ 23, 24, 25, _o, _o, _o, _o, _o, // 88 -+ _o, 26, 27, 28, 29, 30, 31, 32, // 96 - 33, 34, 35, 36, 37, 38, 39, 40, // 104 - 41, 42, 43, 44, 45, 46, 47, 48, // 112 -- 49, 50, 51, -1, -1, -1, -1, -1 // 120 -+ 49, 50, 51, _o, _o, _o, _o, _o // 120 - }; - const char* from_table = _from_table; - } diff --git a/sources b/sources index c2f526e..67ed5f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2473eed623c93a6d40b823bbc6e0e9c2 wt-3.3.5-rc2-free.tar.xz +22537188d09d50c218c373026ee482e0 wt-3.3.6-free.tar.xz diff --git a/wt-3.3.5-PACKAGE-LICENSING b/wt-3.3.6-PACKAGE-LICENSING similarity index 100% rename from wt-3.3.5-PACKAGE-LICENSING rename to wt-3.3.6-PACKAGE-LICENSING diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh index e4027ed..8e4d5f6 100755 --- a/wt-generate-tarball.sh +++ b/wt-generate-tarball.sh @@ -1,10 +1,13 @@ #!/bin/sh +set -euo pipefail +IFS=$'\n\t' + NAME="wt" VERSION=$1 tmp=`mktemp -d` -tar -xzvf $NAME-$VERSION.tar.gz -C $tmp +tar -xzvf $VERSION.tar.gz -C $tmp pushd $tmp pushd $NAME-$VERSION/src/Wt/Dbo/backend rm -r ibpp diff --git a/wt.spec b/wt.spec index 85a7cf8..c3ad337 100644 --- a/wt.spec +++ b/wt.spec @@ -3,11 +3,10 @@ %global WTRUNUSER apache %global WTRUNGROUP apache -%global alphatag rc2 Name: wt -Version: 3.3.5 -Release: 0.6.%{alphatag}%{?dist} +Version: 3.3.6 +Release: 1%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -15,9 +14,9 @@ Group: Development/Libraries License: GPLv2 and Boost and MIT and (Boost or MIT) and BSD and zlib URL: http://www.webtoolkit.eu/wt # Following archive was made from upstream tarball downloaded from -# http://citylan.dl.sourceforge.net/project/witty/wt/3.3.4/wt-3.3.4.tar.gz +# https://github.com/kdeforche/wt/archive/3.3.6.tar.gz # by running ./wt-generate-tarball.sh 3.3.5-rc2 from tarball's directory -Source0: %{name}-%{version}-%{alphatag}-free.tar.xz +Source0: %{name}-%{version}-free.tar.xz Source1: %{name}-%{version}-PACKAGE-LICENSING # Explain why the locale example is renamed to timezone. Source2: timezone-README.fedora @@ -32,10 +31,8 @@ Source4: wt-generate-tarball.sh Patch0: find-mysql.patch Patch1: use-system-sqlite.patch -# Fixes compilation on armv7hl with gcc 5.x -Patch2: fix-narrowing-issue-on-arm.patch -BuildRequires: cmake >= 2.6 boost-devel >= 1.41 openssl-devel doxygen +BuildRequires: cmake >= 2.6 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel BuildRequires: mysql-devel libharu-devel fcgi-devel zlib-devel qt-devel @@ -114,10 +111,9 @@ Group: Documentation This package contains the documents for Wt API and examples. %prep -%setup -q -n %{name}-%{version}-%{alphatag} +%setup -q -n %{name}-%{version} %patch0 -p1 -b .find-mysql %patch1 -p1 -b .use-system-sqlite -%patch2 -p1 -b .fix-narrowing-issue-on-arm # static files like javascript and css should not be executable for d in src resources examples; do @@ -297,6 +293,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* 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) From 250f2757056fe877b44f8f89c1086de892e9ca38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Sun, 23 Apr 2017 16:13:33 +0200 Subject: [PATCH 2/3] New upstream version 3.3.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: bz#1397456 Resolves: bz#1424546 Resolves: bz#1418493 Signed-off-by: Michal Minář --- .gitignore | 2 +- sources | 2 +- ...PACKAGE-LICENSING => wt-3.3.7-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 1 - wt.spec | 14 ++++++++++---- 5 files changed, 12 insertions(+), 7 deletions(-) rename wt-3.3.6-PACKAGE-LICENSING => wt-3.3.7-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 969a17d..eddc251 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-3.3.6-free.tar.xz +/wt-3.3.7-free.tar.xz diff --git a/sources b/sources index 67ed5f5..97a8fca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22537188d09d50c218c373026ee482e0 wt-3.3.6-free.tar.xz +SHA512 (wt-3.3.7-free.tar.xz) = 4dcc7ac3e222a7056026004213422d571af7ed7066a50ab2bd90c432450f8da3456f45cdf0dee877d46cd11ccb03716de5b81cd2d6daa6520b07a54fa8dd1a47 diff --git a/wt-3.3.6-PACKAGE-LICENSING b/wt-3.3.7-PACKAGE-LICENSING similarity index 100% rename from wt-3.3.6-PACKAGE-LICENSING rename to wt-3.3.7-PACKAGE-LICENSING diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh index 8e4d5f6..dbde0e4 100755 --- a/wt-generate-tarball.sh +++ b/wt-generate-tarball.sh @@ -17,4 +17,3 @@ tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION popd # tmp mv $tmp/$NAME-$VERSION-free.tar.xz . rm -r $tmp - diff --git a/wt.spec b/wt.spec index c3ad337..aa79a7b 100644 --- a/wt.spec +++ b/wt.spec @@ -5,7 +5,7 @@ %global WTRUNGROUP apache Name: wt -Version: 3.3.6 +Version: 3.3.7 Release: 1%{?dist} Summary: C++ library for developing web applications @@ -14,8 +14,8 @@ Group: Development/Libraries License: GPLv2 and Boost and MIT and (Boost or MIT) and BSD and zlib URL: http://www.webtoolkit.eu/wt # Following archive was made from upstream tarball downloaded from -# https://github.com/kdeforche/wt/archive/3.3.6.tar.gz -# by running ./wt-generate-tarball.sh 3.3.5-rc2 from tarball's directory +# 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. @@ -172,7 +172,7 @@ make doc %install pushd wt-build -make install DESTDIR=$RPM_BUILD_ROOT +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} @@ -195,6 +195,8 @@ do # create a symlink for each feature example pointing on resources dir done popd # examples popd # wt-build +install -vm 0755 -d ${RPM_BUILD_ROOT}/%{_datadir}/cmake/Modules +install -vm 0644 cmake/FindWt.cmake ${RPM_BUILD_ROOT}/%{_datadir}/cmake/Modules install -vm 644 %{SOURCE2} \ ${RPM_BUILD_ROOT}%{_libdir}/Wt/examples/feature/timezone/README.fedora @@ -272,6 +274,7 @@ popd %dir %{_includedir}/Wt %{_includedir}/Wt/* %{_libdir}/*.so +%{_datadir}/cmake/Modules/*.cmake %files examples %dir %{_libdir}/Wt @@ -293,6 +296,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sun Apr 23 2017 Michal Minar 3.3.7-1 +- New upstream version 3.3.7 + * Mon Aug 08 2016 Michal Minar 3.3.6-1 - New upstream version 3.3.6 From 1a21bc8228b5b2342607d4a15d57ff39e588fef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Fri, 8 Sep 2017 15:27:25 +0200 Subject: [PATCH 3/3] New upstream version 3.3.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- .gitignore | 2 +- sources | 2 +- ...GE-LICENSING => wt-3.3.8-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 49 ++++++++++++++----- wt.spec | 9 ++-- 5 files changed, 46 insertions(+), 16 deletions(-) rename wt-3.3.7-PACKAGE-LICENSING => wt-3.3.8-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index eddc251..50279a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-3.3.7-free.tar.xz +/wt-3.3.8-free.tar.xz diff --git a/sources b/sources index 97a8fca..ad9ac18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-3.3.7-free.tar.xz) = 4dcc7ac3e222a7056026004213422d571af7ed7066a50ab2bd90c432450f8da3456f45cdf0dee877d46cd11ccb03716de5b81cd2d6daa6520b07a54fa8dd1a47 +SHA512 (wt-3.3.8-free.tar.xz) = a80f54b8e045c086b5368c23f031b5eba66596b478f07c38eddd9bd4ec754dea036733d388619793ae5d9b0172d0217a30086234abdbe0e8c3efd5e2489b269d diff --git a/wt-3.3.7-PACKAGE-LICENSING b/wt-3.3.8-PACKAGE-LICENSING similarity index 100% rename from wt-3.3.7-PACKAGE-LICENSING rename to wt-3.3.8-PACKAGE-LICENSING diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh index dbde0e4..b10c2d8 100755 --- a/wt-generate-tarball.sh +++ b/wt-generate-tarball.sh @@ -3,17 +3,44 @@ set -euo pipefail IFS=$'\n\t' -NAME="wt" -VERSION=$1 +readonly NAME="wt" + +readonly USAGE="Usage: ${BASH_SOURCE[0]} (-h | ) + +Extracts archive of ${NAME} of given VERSION and removes all unfree source code +and packs the resulting tree into ${NAME}-VERSION.tar.xz compressed archive. + +Options: + -h Print this help and exit." + +if [[ $# -lt 1 ]]; then + echo "Missing version argument!" >&2 + exit 1 +fi +if [[ "$1" == "-h" ]]; then + echo "${USAGE}" + exit 0 +fi +readonly VERSION="$1" +readonly TARGET="${NAME}-${VERSION}-free.tar.xz" + tmp=`mktemp -d` -tar -xzvf $VERSION.tar.gz -C $tmp -pushd $tmp -pushd $NAME-$VERSION/src/Wt/Dbo/backend -rm -r ibpp -popd # backend -rm -r $NAME-$VERSION/resources/jPlayer -tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION +function cleanup() { + rm -r "${tmp}" +} +trap cleanup EXIT + +tar -xzvf "${NAME}-${VERSION}.tar.gz" -C "${tmp}" +pushd "${tmp}" + pushd "${NAME}-${VERSION}/src/Wt/Dbo/backend" + rm -r ibpp + popd # backend + rm -r "${NAME}-${VERSION}/resources/jPlayer" + + tar -cJvf "${TARGET}" "${NAME}-${VERSION}" popd # tmp -mv $tmp/$NAME-$VERSION-free.tar.xz . -rm -r $tmp + +mv "${tmp}/${NAME}-${VERSION}-free.tar.xz" . +printf "-------------------------------------------\n" +printf "To upload the archive, run:\n\n fedpkg upload %s\n\n" "${TARGET}" diff --git a/wt.spec b/wt.spec index aa79a7b..1f5533e 100644 --- a/wt.spec +++ b/wt.spec @@ -5,7 +5,7 @@ %global WTRUNGROUP apache Name: wt -Version: 3.3.7 +Version: 3.3.8 Release: 1%{?dist} Summary: C++ library for developing web applications @@ -14,8 +14,8 @@ Group: Development/Libraries License: GPLv2 and Boost and MIT and (Boost or MIT) and BSD and zlib URL: http://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 +# https://github.com/kdeforche/wt/archive/3.3.8.tar.gz +# by running ./wt-generate-tarball.sh 3.3.8 from tarball's directory Source0: %{name}-%{version}-free.tar.xz Source1: %{name}-%{version}-PACKAGE-LICENSING # Explain why the locale example is renamed to timezone. @@ -296,6 +296,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon Sep 11 2017 Michal Minar 3.3.8-1 +- New upstream version 3.3.8 + * Sun Apr 23 2017 Michal Minar 3.3.7-1 - New upstream version 3.3.7