[xfce4-wavelan-plugin] Update to 0.5.11

Christoph Wickert cwickert at fedoraproject.org
Sat Jun 30 23:50:13 UTC 2012


commit 0763233eb48bbe81390d6edbdeb2adfc6c57bd45
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Jul 1 01:50:11 2012 +0200

    Update to 0.5.11
    
    - Define the Xfce version conditionally
    - Add review # and VCS key

 .gitignore                |    1 +
 sources                   |    2 +-
 xfce4-wavelan-plugin.spec |   40 ++++++++++++++++++++++++++++++----------
 3 files changed, 32 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ccb735e..ac338b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xfce4-wavelan-plugin-0.5.5.tar.bz2
 /xfce4-wavelan-plugin-0.5.6.tar.bz2
 /xfce4-wavelan-plugin-0.5.10.tar.bz2
+/xfce4-wavelan-plugin-0.5.11.tar.bz2
diff --git a/sources b/sources
index 3544197..931bf85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4cd20ef471123936e762a139f1025e1  xfce4-wavelan-plugin-0.5.10.tar.bz2
+50514bb286f1ed6761a1b36832bb7fe3  xfce4-wavelan-plugin-0.5.11.tar.bz2
diff --git a/xfce4-wavelan-plugin.spec b/xfce4-wavelan-plugin.spec
index d07814d..5a6a8d2 100644
--- a/xfce4-wavelan-plugin.spec
+++ b/xfce4-wavelan-plugin.spec
@@ -1,20 +1,29 @@
-%global minor_version 0.5
+# Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173670
+
+%global minorversion 0.5
+%if 0%{?fedora} >= 18
+    %global xfceversion 4.10
+%else
+    %global xfceversion 4.8
+%endif
 
 Name:           xfce4-wavelan-plugin
-Version:        0.5.10
-Release:        2%{?dist}
+Version:        0.5.11
+Release:        1%{?dist}
 Summary:        WaveLAN plugin for the Xfce panel
 
 Group:          User Interface/Desktops
 License:        BSD
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2
+#VCS: git:git://git.xfce.org/panel-plugins/xfce4-wavelan-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
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -31,10 +40,16 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/libwavelan.so
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# remove la file
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
+# FIXME: make sure debuginfo is generated properly (#795107)
+chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
+
 %find_lang %{name}
-rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libwavelan.la
+
 
 %clean
 rm -rf %{buildroot}
@@ -47,6 +62,11 @@ rm -rf %{buildroot}
 %{_datadir}/xfce4/panel/plugins/*.desktop
 
 %changelog
+* Sat Jun 30 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.11-1
+- Update to 0.5.11
+- Define the Xfce version conditionally
+- Add review # and VCS key
+
 * Tue Apr 24 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.5.10-2
 - Fix -debuginfo.
 


More information about the scm-commits mailing list