From c937bdb50395cb462e428e4be7e378f93c3b463e 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 1/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 +- ...CKAGE-LICENSING => wt-3.3.7-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 1 - wt.spec | 16 +++++++++++----- 5 files changed, 13 insertions(+), 8 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 d3ba92e..6449271 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 3.3.6 -Release: 3%{?dist} +Version: 3.3.7 +Release: 1%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -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 + * Sat Feb 11 2017 Fedora Release Engineering - 3.3.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 1d2e4021273bcaa929f6d0f598f66fa2383f7168 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 20:51:46 +0000 Subject: [PATCH 2/3] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 6449271..9501361 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -296,6 +296,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* 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 From 0330c0385be452c4458a8a9594354f517fe25a30 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 | 11 +++-- 5 files changed, 47 insertions(+), 17 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 9501361..5d5d92d 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 3.3.7 -Release: 2%{?dist} +Version: 3.3.8 +Release: 1%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -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 +* Fri Sep 08 2017 Michal Minar 3.3.8-1 +- New upstream version 3.3.8 + * Mon May 15 2017 Fedora Release Engineering - 3.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild