diff --git a/.gitignore b/.gitignore index aac1b69..c755cb4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /Botan-1.8.11.stripped.tbz /Botan-1.8.12.stripped.tbz /Botan-1.8.13.stripped.tbz +/Botan-1.8.14.stripped.tbz diff --git a/botan-1.8.13-soname.patch b/botan-1.8.13-soname.patch deleted file mode 100644 index fd21e6b..0000000 --- a/botan-1.8.13-soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -============================================================ ---- configure.py 56ef9e873a4807c437f22b0ab58a22987e6ab2f9 -+++ configure.py 3cdef18138198b63b180b200ea521140b161ffcc -@@ -38,7 +38,7 @@ class BuildConfigurationInformation(obje - version_major = 1 - version_minor = 8 - version_patch = 13 -- version_so_patch = 13 -+ version_so_patch = 2 - version_suffix = '' - - version_string = '%d.%d.%d%s' % ( diff --git a/botan-1.8.14-soname.patch b/botan-1.8.14-soname.patch new file mode 100644 index 0000000..6976728 --- /dev/null +++ b/botan-1.8.14-soname.patch @@ -0,0 +1,19 @@ +# +# old_revision [adcf24b7e258c125f78aaff4ef2d3557f1183c3e] +# +# patch "configure.py" +# from [b43917e0e74e7ef1ff0024542da0dabe104a1582] +# to [ba82e657a585f31e9ba20056a57c5f597c0f0297] +# +============================================================ +--- configure.py b43917e0e74e7ef1ff0024542da0dabe104a1582 ++++ configure.py ba82e657a585f31e9ba20056a57c5f597c0f0297 +@@ -38,7 +38,7 @@ class BuildConfigurationInformation(obje + version_major = 1 + version_minor = 8 + version_patch = 14 +- version_so_patch = 13 ++ version_so_patch = 2 + version_suffix = '' + + version_string = '%d.%d.%d%s' % ( diff --git a/botan.spec b/botan.spec index f04572f..cb1aebf 100644 --- a/botan.spec +++ b/botan.spec @@ -1,6 +1,6 @@ Name: botan -Version: 1.8.13 -Release: 5%{?dist}.2 +Version: 1.8.14 +Release: 1%{?dist} Summary: Crypto library written in C++ Group: System Environment/Libraries @@ -11,7 +11,7 @@ URL: http://botan.randombit.net/ Source0: Botan-%{version}.stripped.tbz Source1: README.fedora # soname was changed unintentionally upstream, revert it. -Patch0: botan-1.8.13-soname.patch +Patch0: botan-1.8.14-soname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-c++ @@ -122,6 +122,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate %changelog +* Sat Aug 25 2012 Thomas Moschny - 1.8.14-1 +- Update to 1.8.14. + * Wed Jul 18 2012 Fedora Release Engineering - 1.8.13-5.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/repack.sh b/repack.sh index 5b018b7..9bd4162 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=1.8.13 +version=1.8.14 name=Botan-${version} suffix=.tbz newsuffix=.stripped.tbz @@ -11,13 +11,13 @@ tmpfile=$(mktemp) ${compr} -cd ${name}${suffix} > ${tmpfile} -tar --delete --file=${tmpfile} Botan-${version}/src/block/idea -tar --delete --file=${tmpfile} Botan-${version}/src/block/rc6 -tar --delete --file=${tmpfile} Botan-${version}/src/block/rc5 -tar --delete --file=${tmpfile} Botan-${version}/src/math/gfpmath -tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ec_dompar -tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecc_key -tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecdsa -tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/eckaeg +tar --delete --file=${tmpfile} ./Botan-${version}/src/block/idea +tar --delete --file=${tmpfile} ./Botan-${version}/src/block/rc6 +tar --delete --file=${tmpfile} ./Botan-${version}/src/block/rc5 +tar --delete --file=${tmpfile} ./Botan-${version}/src/math/gfpmath +tar --delete --file=${tmpfile} ./Botan-${version}/src/pubkey/ec_dompar +tar --delete --file=${tmpfile} ./Botan-${version}/src/pubkey/ecc_key +tar --delete --file=${tmpfile} ./Botan-${version}/src/pubkey/ecdsa +tar --delete --file=${tmpfile} ./Botan-${version}/src/pubkey/eckaeg ${compr} -c ${tmpfile} > ${name}${newsuffix} diff --git a/sources b/sources index 496c1ae..219b46d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1cf4c2990a60867603fc111f0715e24 Botan-1.8.13.stripped.tbz +4b5ce78b1cfc0735eb7ec4f6903068ca Botan-1.8.14.stripped.tbz