From 79a7e9e108e6fe8301e2b4db301da52342cf86d3c740deaf0a25b74a3c783617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 18 Feb 2016 12:26:55 +0000 Subject: [PATCH] Accepting request 360116 from home:mimi_vx:branches:server:irc - fix sle12 conditional OBS-URL: https://build.opensuse.org/request/show/360116 OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=70 --- weechat.changes | 5 +++++ weechat.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/weechat.changes b/weechat.changes index 8b98df2..9fa9be1 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 18 11:58:33 UTC 2016 - mimi.vx@gmail.com + +- fix sle12 conditional + ------------------------------------------------------------------- Mon Jan 11 06:38:16 UTC 2016 - mimi.vx@gmail.com diff --git a/weechat.spec b/weechat.spec index 0acc442..b43ee43 100644 --- a/weechat.spec +++ b/weechat.spec @@ -16,6 +16,7 @@ # + Name: weechat Version: 1.4 Release: 0 @@ -60,7 +61,7 @@ Recommends: %{name}-python = %{version} Suggests: %{name}-doc BuildRoot: %{_tmppath}/%{name}-%{version}-build # Not on SLE12 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: source-highlight %endif @@ -73,7 +74,7 @@ several scripting languages. %lang_package # Not on SLE12 -%if 0%{?suse_version} != 1315 +%%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %package doc Summary: Documentation for %{name} Group: Documentation/HTML @@ -176,7 +177,7 @@ install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.de %suse_update_desktop_file -r "%{name}" Network IRCClient # Not on SLE12 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} mv "%{buildroot}%{_datadir}/doc/weechat" html %endif @@ -191,7 +192,7 @@ mv "%{buildroot}%{_datadir}/doc/weechat" html %icon_theme_cache_postun # Not on SLE12 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %files doc %defattr(-,root,root) %doc html/