[xfce4-mount-plugin] Streamline spec

Christoph Wickert cwickert at fedoraproject.org
Mon Apr 30 23:35:56 UTC 2012


commit 48506f9b02f5c51ed94d380ba2e5e60d6060d219
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Mon Apr 30 23:45:18 2012 +0200

    Streamline spec

 xfce4-mount-plugin.spec |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/xfce4-mount-plugin.spec b/xfce4-mount-plugin.spec
index 8048914..44e3b3b 100644
--- a/xfce4-mount-plugin.spec
+++ b/xfce4-mount-plugin.spec
@@ -1,6 +1,7 @@
 # Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173549
 
 %global minorversion 0.6
+%global xfceversion 4.10
 
 Name:           xfce4-mount-plugin
 Version:        0.6.3
@@ -10,13 +11,15 @@ Summary:        Mount/unmount utility for the Xfce panel
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
+#VCS: git:git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin
 Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xfce4-panel-devel >= 4.8.0
 BuildRequires:  libxfce4ui-devel >= 4.8.0
-BuildRequires:  gettext, intltool
-Requires:       xfce4-panel >= 4.8.0
+BuildRequires:  xfce4-panel-devel >= 4.8.0
+BuildRequires:  gettext
+BuildRequires:  intltool
+Requires:       xfce4-panel >= %{xfceversion}
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -29,11 +32,17 @@ Mount and unmount filesystems from the Xfce panel.
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-chmod -c +x $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libmount.so
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# remove la file
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+# make sure debuginfo is generated properly
+chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
+
 %find_lang %{name}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel/plugins/libmount.la
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -53,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_libdir}/xfce4/panel/plugins/libmount.so
+%{_libdir}/xfce4/panel/plugins/*.so
 %{_datadir}/xfce4/panel/plugins/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 


More information about the scm-commits mailing list