From 337b5c1875b88f0df5e804d8068734777e7291d1754a1c3dc088f4508865dbd5 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 21 Sep 2016 22:15:37 +0000 Subject: [PATCH 1/2] - add BR for xz to fix build on sle11 - switch to %{?_smp_mflags} - pass --disable-silent-rules to get verbose makefiles again OBS-URL: https://build.opensuse.org/package/show/server:irc/irssi?expand=0&rev=70 --- irssi.changes | 7 +++++++ irssi.spec | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/irssi.changes b/irssi.changes index e92bf34..474904e 100644 --- a/irssi.changes +++ b/irssi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 21 22:07:13 UTC 2016 - mrueckert@suse.de + +- add BR for xz to fix build on sle11 +- switch to %{?_smp_mflags} +- pass --disable-silent-rules to get verbose makefiles again + ------------------------------------------------------------------- Wed Sep 21 20:23:55 UTC 2016 - meissner@suse.com diff --git a/irssi.spec b/irssi.spec index b6738fa..1a6c81a 100644 --- a/irssi.spec +++ b/irssi.spec @@ -38,6 +38,7 @@ BuildRequires: update-desktop-files BuildRequires: perl-macros %endif BuildRequires: perl +BuildRequires: xz Conflicts: %{name}-snapshot # Url: http://www.irssi.org @@ -111,6 +112,7 @@ export PKG_CONFIG_PATH="/opt/gnome/%{_lib}/pkgconfig:$PKG_CONFIG_PATH" export CFLAGS="%{optflags} -fno-strict-aliasing -DGLIB_DISABLE_DEPRECATION_WARNINGS -fPIE" export LDFLAGS="-pie" %configure \ + --disable-silent-rules \ --enable-ipv6 \ --with-bot \ --with-proxy \ @@ -124,10 +126,10 @@ export LDFLAGS="-pie" --enable-true-color \ --with-perl=yes \ --with-perl-lib=vendor -%__make %{?jobs:-j%{jobs}} all +%__make %{?_smp_mflags} all V=1 %install -%makeinstall docdir=%{_docdir}/%{name} +%makeinstall docdir=%{_docdir}/%{name} V=1 %perl_process_packlist %__rm %{buildroot}%{_libdir}/irssi/modules/libirc_proxy.{a,la} From 82ac6f9d1f08fe88152bc00c2dcce90923a8660de3289ebb667dcdd7bf1b3194 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 21 Sep 2016 22:29:13 +0000 Subject: [PATCH 2/2] - disable PIE on sle11 OBS-URL: https://build.opensuse.org/package/show/server:irc/irssi?expand=0&rev=71 --- irssi.changes | 5 +++++ irssi.spec | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/irssi.changes b/irssi.changes index 474904e..fcad5ba 100644 --- a/irssi.changes +++ b/irssi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 21 22:24:11 UTC 2016 - mrueckert@suse.de + +- disable PIE on sle11 + ------------------------------------------------------------------- Wed Sep 21 22:07:13 UTC 2016 - mrueckert@suse.de diff --git a/irssi.spec b/irssi.spec index 1a6c81a..dd8f0cc 100644 --- a/irssi.spec +++ b/irssi.spec @@ -109,8 +109,14 @@ Authors: %if 0%{?sles_version} == 9 export PKG_CONFIG_PATH="/opt/gnome/%{_lib}/pkgconfig:$PKG_CONFIG_PATH" %endif -export CFLAGS="%{optflags} -fno-strict-aliasing -DGLIB_DISABLE_DEPRECATION_WARNINGS -fPIE" + +export CFLAGS="%{optflags} -fno-strict-aliasing -DGLIB_DISABLE_DEPRECATION_WARNINGS" + +%if 0%{?suse_version} > 1110 +export CFLAGS="$CFLAGS -fPIE" export LDFLAGS="-pie" +%endif + %configure \ --disable-silent-rules \ --enable-ipv6 \