[gkrellm-volume] Reduce linkage bloat from pkg-config gtk+-2.0. Build with $RPM_LD_FLAGS. Specfile cleanups.

[Ville Skyttä]

commit 0e5caee6441f67a089964ad91e68767ec3e878c3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Nov 5 09:57:25 2011 +0200

    Reduce linkage bloat from pkg-config gtk+-2.0.
    Build with $RPM_LD_FLAGS.
    Specfile cleanups.

 gkrellm-volume.spec |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/gkrellm-volume.spec b/gkrellm-volume.spec
index 393e547..f1ce462 100644
--- a/gkrellm-volume.spec
+++ b/gkrellm-volume.spec
@@ -1,11 +1,11 @@
 %global plugdir %{_libdir}/gkrellm2/plugins
+%global __provides_exclude_from ^%{plugdir}/.*\\.so.*$
 
 Name:           gkrellm-volume
 Version:        2.1.13
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        GKrellM volume plugin
 
-Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://gkrellm.luon.net/volume.php
 Source0:        http://gkrellm.luon.net/files/%{name}-%{version}.tar.gz
@@ -17,7 +17,6 @@ Patch1:         %{name}-optflags.patch
 Patch2:         %{name}-2.1.13-device-updown-552022.patch
 # #580165, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch?revision=1.1&view=markup
 Patch3:         %{name}-2.1.13-reenable.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gkrellm-devel >= 2.0
 BuildRequires:  gtk2-devel >= 2.0.1
@@ -25,10 +24,6 @@ BuildRequires:  gettext
 BuildRequires:  alsa-lib-devel
 Requires:       gkrellm%{?_isa} >= 2.0
 
-%{?filter_setup:
-%filter_provides_in %{plugdir}
-%filter_setup}
-
 %description
 GKrellM plugin for controlling mixer devices.
 
@@ -43,7 +38,9 @@ f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} enable_nls=1 enable_alsa=1
+# --as-needed: reduce linkage bloat from pkg-config --libs gtk+-2.0
+CFLAGS="$RPM_OPT_FLAGS -Wl,--as-needed $RPM_LD_FLAGS" \
+  make %{?_smp_mflags} enable_nls=1 enable_alsa=1
 
 
 %install
@@ -57,17 +54,17 @@ make install \
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc Changelog COPYRIGHT README THEMING
 %{plugdir}/volume.so
 
 
 %changelog
+* Sat Nov  5 2011 Ville Skyttä <ville.skytta at iki.fi> - 2.1.13-15
+- Reduce linkage bloat from pkg-config gtk+-2.0.
+- Build with $RPM_LD_FLAGS.
+- Specfile cleanups.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.13-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild