rpm/weechat
SHA256
1
0
Fork 0
forked from pool/weechat
Code Pull Requests Activity

- Ensure we use system CA ca-bundle.pem file by hardcoding it

Browse Source 
- Remove patch:
  * weechat-capath.patch

OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=65
This commit is contained in:
Tomáš Chvátal 2015-08-04 13:33:12 +00:00 committed by Git OBS Bridge
parent 1dcba33597
commit 8c6a59396d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
weechat.changes
View File

@ -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 Sat Jul 4 12:47:38 UTC 2015 - tchvatal@suse.com

10
weechat.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package weechat # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -25,9 +25,8 @@ Group: Productivity/Networking/IRC
Url: http://www.weechat.org Url: http://www.weechat.org
Source: http://www.weechat.org/files/src/%{name}-%{version}.tar.bz2 Source: http://www.weechat.org/files/src/%{name}-%{version}.tar.bz2
Source1: weechat.desktop 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: asciidoc
BuildRequires: ca-certificates
BuildRequires: cmake BuildRequires: cmake
BuildRequires: curl-devel BuildRequires: curl-devel
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
@ -50,6 +49,7 @@ BuildRequires: python-devel
BuildRequires: ruby-devel BuildRequires: ruby-devel
BuildRequires: tcl-devel BuildRequires: tcl-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
Requires: ca-certificates
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
# without scripts it is bit annoying # without scripts it is bit annoying
@ -148,7 +148,6 @@ Spell-checking support for %{name}, using the aspell library.
%prep %prep
%setup -q %setup -q
%patch0 -p1
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
TIME="\"$(date -d "${modified}" "+%%R")\"" TIME="\"$(date -d "${modified}" "+%%R")\""
@ -165,7 +164,8 @@ export CFLAGS="%{optflags}"
-DPYTHON_LIBRARY="%{_libdir}/libpython%{py_ver}.so" \ -DPYTHON_LIBRARY="%{_libdir}/libpython%{py_ver}.so" \
-DENABLE_ENCHANT=ON \ -DENABLE_ENCHANT=ON \
-DENABLE_DOC=ON \ -DENABLE_DOC=ON \
-DENABLE_MAN=ON -DENABLE_MAN=ON \
-DCA_FILE=%{_sysconfdir}/ssl/ca-bundle.pem
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install