From 7aaaba071e7ddfa790899e6bf7c476155559ff9b Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Mon, 8 Feb 2016 18:40:49 +0100
Subject: [PATCH] Update to 1.10.12.

- Mark license.txt with %license.
- Change %define -> %global.
---
 .gitignore | 12 ++----------
 botan.spec | 31 +++++++++++++++++++++++--------
 repack.sh  | 26 ++++++++++++++------------
 sources    |  2 +-
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index a10c5ff..b5deeda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,2 @@
-/Botan-1.8.9.tbz
-/Botan-1.8.9.stripped.tbz
-/Botan-1.8.10.stripped.tbz
-/Botan-1.8.11.stripped.tbz
-/Botan-1.8.12.stripped.tbz
-/Botan-1.8.13.stripped.tbz
-/Botan-1.8.14.stripped.tbz
-/Botan-1.10.5.stripped.tbz
-/Botan-1.10.8.stripped.tbz
-/Botan-1.10.9.stripped.tbz
+/Botan-*.stripped.tbz
+/Botan-1.10.12.stripped.tar.gz
diff --git a/botan.spec b/botan.spec
index 5f54228..a20b4a7 100644
--- a/botan.spec
+++ b/botan.spec
@@ -1,16 +1,16 @@
 %global major_version 1.10
 
 Name:           botan
-Version:        %{major_version}.9
-Release:        10%{?dist}
+Version:        %{major_version}.12
+Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://botan.randombit.net/
 # tarfile is stripped using repack.sh. original tarfile to be found
-# here: http://files.randombit.net/botan/Botan-%%{version}.tbz
-Source0:        Botan-%{version}.stripped.tbz
+# here: http://botan.randombit.net/releases/Botan-%%{version}.tgz
+Source0:        Botan-%{version}.stripped.tar.gz
 Source1:        README.fedora
 Patch0:         botan-aarch64.patch
 Patch1:         botan-1.10-add-ppc64le.patch
@@ -90,10 +90,10 @@ rm -rf checks/ec_tests.cpp
 
 %build
 # we have the necessary prerequisites, so enable optional modules
-%define enable_modules bzip2,zlib,openssl
+%global enable_modules bzip2,zlib,openssl
 
 # fixme: maybe disable unix_procs, very slow.
-%define disable_modules gnump
+%global disable_modules gnump
 
 ./configure.py \
         --prefix=%{_prefix} \
@@ -141,8 +141,13 @@ rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo}
 %files
 %dir %{_pkgdocdir}
 %{_pkgdocdir}/readme.txt
-%{_pkgdocdir}/license.txt
 %{_pkgdocdir}/README.fedora
+%if 0%{?_licensedir:1}
+%exclude %{_pkgdocdir}/license.txt
+%license doc/license.txt
+%else
+%{_pkgdocdir}/license.txt
+%endif # licensedir
 %{_libdir}/libbotan-%{major_version}.so.*
 
 
@@ -161,8 +166,13 @@ rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo}
 # next files duplicated on purpose, because -doc doesn't depend on the
 # main package
 %{_pkgdocdir}/readme.txt
-%{_pkgdocdir}/license.txt
 %{_pkgdocdir}/README.fedora
+%if 0%{?_licensedir:1}
+%exclude %{_pkgdocdir}/license.txt
+%license doc/license.txt
+%else
+%{_pkgdocdir}/license.txt
+%endif # licensedir
 
 
 %files python
@@ -183,6 +193,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
 
 
 %changelog
+* Mon Feb  8 2016 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.12-1
+- Update to 1.10.12.
+- Mark license.txt with %%license.
+- Change %%define -> %%global.
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.9-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/repack.sh b/repack.sh
index 3eb65b2..53d4959 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,18 +1,20 @@
 #! /bin/bash
 
-version=1.10.9
-name=Botan-${version}
-suffix=.tbz
-newsuffix=.stripped.tbz
-compr=bzip2
+name=Botan-1.10.12
+src=${name}.tgz
+dst=${name}.stripped.tar.gz
 
-trap '${tmpfile:+rm ${tmpfile}}' EXIT
-tmpfile=$(mktemp)
+rm -f ${dst} ${dst%.gz}
+cp -av ${src} ${dst}
 
-${compr} -cd ${name}${suffix} > ${tmpfile}
+gzip -d ${dst}
 
-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/pubkey/gost_3410
+tar --delete --file=${dst%.gz} \
+    ${name}/src/block/rc6 \
+    ${name}/src/block/rc5 \
+    ${name}/src/pubkey/gost_3410
+
+touch -m -r ${src} ${dst%.gz}
+
+gzip ${dst%.gz}
 
-${compr} -c ${tmpfile} > ${name}${newsuffix}
diff --git a/sources b/sources
index 804aba0..526ce3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44eb12a2757f51623b17b38fe8b9df2c  Botan-1.10.9.stripped.tbz
+d59f0fd44bc3f8b71025d79c9ffe75ba  Botan-1.10.12.stripped.tar.gz