From d63703208c1405f3c7cc07534c32a355f98dcb27d17ecea770a778a58ff48d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 28 Jan 2015 10:42:56 +0000 Subject: [PATCH 1/2] - Make this build on SLE12 OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=61 --- weechat.changes | 5 +++++ weechat.spec | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/weechat.changes b/weechat.changes index 3ad04aa..da7178b 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 28 10:42:34 UTC 2015 - tchvatal@suse.com + +- Make this build on SLE12 + ------------------------------------------------------------------- Mon Jan 12 07:38:34 UTC 2015 - tchvatal@suse.com diff --git a/weechat.spec b/weechat.spec index b99a755..8c0d123 100644 --- a/weechat.spec +++ b/weechat.spec @@ -1,7 +1,7 @@ # # spec file for package weechat # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ Patch0: weechat-capath.patch BuildRequires: asciidoc BuildRequires: cmake BuildRequires: curl-devel -BuildRequires: docbook5-xsl-stylesheets +BuildRequires: docbook-xsl-stylesheets BuildRequires: enchant-devel BuildRequires: gcc-c++ BuildRequires: grep @@ -48,12 +48,15 @@ BuildRequires: perl BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: ruby-devel -BuildRequires: source-highlight BuildRequires: tcl-devel BuildRequires: update-desktop-files Requires: hicolor-icon-theme Suggests: %{name}-doc BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Not on SLE12 +%if 0%{?suse_version} != 1315 +BuildRequires: source-highlight +%endif %description WeeChat (Wee Enhanced Environment for Chat) is a fast and light cross-platform @@ -63,6 +66,8 @@ several scripting languages. %lang_package +# Not on SLE12 +%if 0%{?suse_version} != 1315 %package doc Summary: Documentation for %{name} Group: Documentation/HTML @@ -70,6 +75,7 @@ Requires: %{name} = %{version} %description doc Various documentation files for %{name}. +%endif %package devel Summary: Development Environment for %{name} Plugins @@ -168,7 +174,10 @@ ln -sf %{_bindir}/weechat %{buildroot}%{_bindir}/weechat-curses install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" %suse_update_desktop_file -r "%{name}" Network IRCClient +# Not on SLE12 +%if 0%{?suse_version} != 1315 mv "%{buildroot}%{_datadir}/doc/weechat" html +%endif %find_lang "%{name}" --with-man @@ -180,9 +189,12 @@ mv "%{buildroot}%{_datadir}/doc/weechat" html %desktop_database_postun %icon_theme_cache_postun +# Not on SLE12 +%if 0%{?suse_version} != 1315 %files doc %defattr(-,root,root) %doc html/ +%endif %files %defattr(-,root,root) From 2b2a46609d66fbbf959dbda4d41b91085854cae7ef7d672998eebd2448c8f6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 28 Jan 2015 12:28:08 +0000 Subject: [PATCH 2/2] - Recommend lang package and perl/python scripting support as bare iron weechat is bit boring OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=62 --- weechat.changes | 6 ++++++ weechat.spec | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/weechat.changes b/weechat.changes index da7178b..c052c5a 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 28 12:27:48 UTC 2015 - tchvatal@suse.com + +- Recommend lang package and perl/python scripting support as + bare iron weechat is bit boring + ------------------------------------------------------------------- Wed Jan 28 10:42:34 UTC 2015 - tchvatal@suse.com diff --git a/weechat.spec b/weechat.spec index 8c0d123..e4ea627 100644 --- a/weechat.spec +++ b/weechat.spec @@ -51,6 +51,10 @@ BuildRequires: ruby-devel BuildRequires: tcl-devel BuildRequires: update-desktop-files Requires: hicolor-icon-theme +Recommends: %{name}-lang = %{version} +# without scripts it is bit annoying +Recommends: %{name}-perl = %{version} +Recommends: %{name}-python = %{version} Suggests: %{name}-doc BuildRoot: %{_tmppath}/%{name}-%{version}-build # Not on SLE12 @@ -66,7 +70,7 @@ several scripting languages. %lang_package -# Not on SLE12 +# Not on SLE12 %if 0%{?suse_version} != 1315 %package doc Summary: Documentation for %{name} @@ -174,8 +178,8 @@ ln -sf %{_bindir}/weechat %{buildroot}%{_bindir}/weechat-curses install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" %suse_update_desktop_file -r "%{name}" Network IRCClient -# Not on SLE12 -%if 0%{?suse_version} != 1315 +# Not on SLE12 +%if 0%{?suse_version} != 1315 mv "%{buildroot}%{_datadir}/doc/weechat" html %endif @@ -189,7 +193,7 @@ mv "%{buildroot}%{_datadir}/doc/weechat" html %desktop_database_postun %icon_theme_cache_postun -# Not on SLE12 +# Not on SLE12 %if 0%{?suse_version} != 1315 %files doc %defattr(-,root,root)