[pidgin] - Fix setting -fstack-protector on F20+, use -fstack-protector-strong there - Filter out provides fr
Orion Poplawski
orion at fedoraproject.org
Fri Jul 19 18:22:35 UTC 2013
commit a8865e384b1cbc4645aa51784372efd84f42be75
Author: Orion Poplawski <orion at nwra.com>
Date: Fri Jul 19 12:22:27 2013 -0600
- Fix setting -fstack-protector on F20+, use -fstack-protector-strong there
- Filter out provides from plugins
pidgin.spec | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/pidgin.spec b/pidgin.spec
index 294ecce..2620f92 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -119,7 +119,7 @@
Name: pidgin
Version: 2.10.7
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+ and GPLv2 and MIT
# GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
# GPLv2 - silc & novell prpls
@@ -280,6 +280,14 @@ BuildRequires: libgadu-devel
BuildRequires: doxygen
%endif
+# Need rpm 4.9+ to be able to do this filtering in arch packages with binaries
+%if 0%{?fedora} >= 15
+# Filter out plugins from provides
+%global __provides_exclude_from ^%{_libdir}/purple
+# Use define to delay evaluation
+%define __requires_exclude ^%(cat %{_builddir}/%{?buildsubdir}/plugins.list)|perl\\(Purple\\)
+%endif
+
%description
Pidgin allows you to talk to anyone using a variety of messaging
protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu,
@@ -517,7 +525,8 @@ SWITCHES="--with-extraversion=%{release}"
%endif
# FC5+ automatic -fstack-protector-all switch
-export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
+# F20+ uses -fstack-protector-strong
+export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector /-fstack-protector-all }
export CFLAGS="$RPM_OPT_FLAGS"
# remove after irc-sasl patch has been merged upstream
@@ -596,6 +605,9 @@ ln -sf ../../doc/pidgin-docs-%{version}/html/ \
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/purple.schemas
%endif
+# Create list of plugins for __requires_exclude
+find %{buildroot}/%{_libdir}/purple-2 -name \*.so\* -printf '%f|' | sed -e 's/|$//' > plugins.list
+
%if ! %{build_only_libs}
%pre
if [ "$1" -gt 1 ]; then
@@ -745,6 +757,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Jul 18 2013 Orion Poplawski <orion at cora.nwra.com> - 2.10.7-5
+- Fix setting -fstack-protector on F20+, use -fstack-protector-strong there
+- Filter out provides from plugins
+
* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 2.10.7-4
- Perl 5.18 rebuild
More information about the scm-commits
mailing list