diff --git a/Botan-fix_install_paths.patch b/Botan-fix_install_paths.patch index 6d5dbc0..bde6fa6 100644 --- a/Botan-fix_install_paths.patch +++ b/Botan-fix_install_paths.patch @@ -42,3 +42,20 @@ Index: src/build-data/makefile/unix_shr.in PKGCONF_DIR = $(LIBDIR)/pkgconfig CONFIG_SCRIPT = %{botan_config} +--- src/build-data/botan-config.in.orig 2016-05-13 00:45:07.618245779 +0200 ++++ src/build-data/botan-config.in 2016-05-13 00:45:38.386439746 +0200 +@@ -32,12 +32,12 @@ while test $# -gt 0; do + exit 0 + ;; + --cflags) +- echo -I$prefix/$includedir ++ echo -I$includedir + ;; + --libs) + if [ $prefix != "/usr" ] + then +- echo -L$prefix/$libdir -lbotan-%{version_major}.%{version_minor} %{link_to} ++ echo -L$libdir -lbotan-%{version_major}.%{version_minor} %{link_to} + else + echo -lbotan-%{version_major}.%{version_minor} %{link_to} + fi diff --git a/Botan-fix_pkgconfig.patch b/Botan-fix_pkgconfig.patch index efbef64..7dfcb6e 100644 --- a/Botan-fix_pkgconfig.patch +++ b/Botan-fix_pkgconfig.patch @@ -1,12 +1,10 @@ -Index: src/build-data/botan.pc.in -=================================================================== ---- src/build-data/botan.pc.in.orig 2011-06-20 15:52:09.000000000 +0200 -+++ src/build-data/botan.pc.in 2011-06-21 18:17:45.434985232 +0200 +--- src/build-data/botan.pc.in.orig 2016-05-13 00:48:09.219402555 +0200 ++++ src/build-data/botan.pc.in 2016-05-13 00:48:57.479714720 +0200 @@ -1,6 +1,6 @@ prefix=%{prefix} exec_prefix=${prefix} -libdir=${prefix}/%{libdir} -+libdir=${prefix}%{libdir} ++libdir=%{libdir} includedir=${prefix}/include/botan-%{version_major}.%{version_minor} Name: Botan diff --git a/Botan.changes b/Botan.changes index b14305e..027cdaa 100644 --- a/Botan.changes +++ b/Botan.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 13 07:31:21 UTC 2016 - faure@kde.org + +- Remove Qt5 dependency, since nothing is using it anymore. +- Fix double-prefix in botan-config and pkgconfig file. + ------------------------------------------------------------------- Wed Feb 3 10:52:19 UTC 2016 - michael@stroeder.com diff --git a/Botan.spec b/Botan.spec index 3784c3e..a66baf8 100644 --- a/Botan.spec +++ b/Botan.spec @@ -1,7 +1,7 @@ # # spec file for package Botan # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,7 +42,6 @@ BuildRequires: gcc-c++ BuildRequires: gmp-devel BuildRequires: gmp-devel >= 4.1 BuildRequires: libbz2-devel -BuildRequires: libqt5-qtbase-devel BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: python @@ -96,7 +95,6 @@ programs that use the Botan library. %build export RPM_OPT_FLAGS -%define common_config_flags --libdir=%{_lib} --with-bzip2 --with-zlib --with-gnump --with-openssl ./configure.py \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -106,10 +104,9 @@ export RPM_OPT_FLAGS --with-zlib \ --with-gnump \ --with-openssl \ - --enable-modules=qt_mutex \ --with-tr1-implementation=system \ --cpu=%{_target_cpu} -make %{?_smp_mflags} WARN_FLAGS="%{optflags} -I/usr/include/Qt" +make %{?_smp_mflags} WARN_FLAGS="%{optflags}" %install make DESTDIR=%{buildroot} install %{?_smp_mflags}