[xfce4-weather-plugin] Update to 0.8.1

Christoph Wickert cwickert at fedoraproject.org
Mon Aug 6 14:19:08 UTC 2012


commit ced6a68a6eca8bb49f50729b3afa1210e1ba7cfd
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Mon Aug 6 16:19:04 2012 +0200

    Update to 0.8.1

 .gitignore                |    1 +
 sources                   |    2 +-
 xfce4-weather-plugin.spec |   71 +++++++++++++++++++++++++++++---------------
 3 files changed, 49 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5fa5c59..cd4ac26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xfce4-weather-plugin-0.7.3.tar.bz2
 /xfce4-weather-plugin-0.7.4.tar.bz2
 /xfce4-weather-plugin-0.8.0.tar.bz2
+/xfce4-weather-plugin-0.8.1.tar.bz2
diff --git a/sources b/sources
index 9c193db..ec5db5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77d23df416f21d3a4cd8253509b5f0cb  xfce4-weather-plugin-0.8.0.tar.bz2
+9f0f23cc78c33b1cf54cae7603cbc0e7  xfce4-weather-plugin-0.8.1.tar.bz2
diff --git a/xfce4-weather-plugin.spec b/xfce4-weather-plugin.spec
index 14b2431..5a922e4 100644
--- a/xfce4-weather-plugin.spec
+++ b/xfce4-weather-plugin.spec
@@ -1,17 +1,30 @@
-Name:		xfce4-weather-plugin
-Version:	0.8.0
-Release:	1%{?dist}
-Summary:	Weather 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}/0.8/%{name}-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
-BuildRequires:	gettext, intltool
-Requires:	xfce4-panel >= 4.4.1
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=173105
+
+%global minorversion 0.8
+
+%if 0%{?fedora} >= 18
+    %global xfceversion 4.10
+%else
+    %global xfceversion 4.8
+%endif
+
+Name:           xfce4-weather-plugin
+Version:        0.8.1
+Release:        1%{?dist}
+Summary:        Weather plugin for the Xfce panel
+
+Group:          User Interface/Desktops
+License:        BSD
+URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
+#VCS: git:git://git.xfce.org/panel-plugins/xfce4-weather-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:  libxfce4ui-devel >= 4.7.0
+BuildRequires:  xfce4-panel-devel >= 4.6.0
+BuildRequires:  gettext
+BuildRequires:  intltool
+Requires:       xfce4-panel >= %{xfceversion}
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -21,20 +34,22 @@ weather condition, using weather data provided by xoap.weather.com.
 %prep
 %setup -q
 
-
 %build
-%configure --disable-static
+%configure
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-%find_lang %{name}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
+# remove la file
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# make sure debuginfo is generated properly
+chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
+
+%find_lang %{name}
 
 
 %post
@@ -47,20 +62,28 @@ if [ $1 -eq 0 ] ; then
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
+%clean
+rm -rf %{buildroot}
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_libexecdir}/xfce4/panel-plugins/%{name}
-%{_datadir}/xfce4/panel-plugins/*.desktop
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-weather.png
+%{_libdir}/xfce4/panel/plugins/*.so
+%{_datadir}/xfce4/panel/plugins/*.desktop
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/xfce4/weather
 
 
 %changelog
+* Mon Aug 06 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.1-1
+- Update to 0.8.1
+
 * Mon Jul 23 2012 Kevin Fenzi <kevin at scrye.com> - 0.8.0-1
 - Update to 0.8.0
 


More information about the scm-commits mailing list