diff --git a/weechat.changes b/weechat.changes index ff52cc3..aa00b5d 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 4 13:28:23 UTC 2015 - tchvatal@suse.com + +- Ensure we use system CA ca-bundle.pem file by hardcoding it +- Remove patch: + * weechat-capath.patch + ------------------------------------------------------------------- Sat Jul 4 12:47:38 UTC 2015 - tchvatal@suse.com diff --git a/weechat.spec b/weechat.spec index 9f7582e..4064899 100644 --- a/weechat.spec +++ b/weechat.spec @@ -1,7 +1,7 @@ # # spec file for package weechat # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -25,9 +25,8 @@ Group: Productivity/Networking/IRC Url: http://www.weechat.org Source: http://www.weechat.org/files/src/%{name}-%{version}.tar.bz2 Source1: weechat.desktop -# PATCH-FIX-UPSTREAM weechat-capath.patch https://savannah.nongnu.org/patch/index.php?8153 lnussel@suse.de -- use system's default certificate store -Patch0: weechat-capath.patch BuildRequires: asciidoc +BuildRequires: ca-certificates BuildRequires: cmake BuildRequires: curl-devel BuildRequires: docbook-xsl-stylesheets @@ -50,6 +49,7 @@ BuildRequires: python-devel BuildRequires: ruby-devel BuildRequires: tcl-devel BuildRequires: update-desktop-files +Requires: ca-certificates Requires: hicolor-icon-theme Recommends: %{name}-lang = %{version} # without scripts it is bit annoying @@ -148,7 +148,6 @@ Spell-checking support for %{name}, using the aspell library. %prep %setup -q -%patch0 -p1 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" @@ -165,7 +164,8 @@ export CFLAGS="%{optflags}" -DPYTHON_LIBRARY="%{_libdir}/libpython%{py_ver}.so" \ -DENABLE_ENCHANT=ON \ -DENABLE_DOC=ON \ - -DENABLE_MAN=ON + -DENABLE_MAN=ON \ + -DCA_FILE=%{_sysconfdir}/ssl/ca-bundle.pem make %{?_smp_mflags} %install