[xfce4-cpugraph-plugin] Update to 1.0.2 (Xfce 4.10 final)
Christoph Wickert
cwickert at fedoraproject.org
Mon Apr 30 10:20:18 UTC 2012
commit 22ac14c5f5057272cb956ab4e6fe258d98be4b35
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Mon Apr 30 12:20:14 2012 +0200
Update to 1.0.2 (Xfce 4.10 final)
- Add VCS key
.gitignore | 1 +
sources | 2 +-
xfce4-cpugraph-plugin.spec | 56 +++++++++++++++++++++++++++----------------
3 files changed, 37 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd7326e..7cdb1df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
xfce4-cpugraph-plugin-0.4.0.tar.gz
/xfce4-cpugraph-plugin-1.0.0.tar.bz2
/xfce4-cpugraph-plugin-1.0.1.tar.bz2
+/xfce4-cpugraph-plugin-1.0.2.tar.bz2
diff --git a/sources b/sources
index 13be029..6fdc804 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff551087b1f61c47b8746e8687c572aa xfce4-cpugraph-plugin-1.0.1.tar.bz2
+93d7658d989ebf110875bc2deb76d7b3 xfce4-cpugraph-plugin-1.0.2.tar.bz2
diff --git a/xfce4-cpugraph-plugin.spec b/xfce4-cpugraph-plugin.spec
index 1f2f353..80225ef 100644
--- a/xfce4-cpugraph-plugin.spec
+++ b/xfce4-cpugraph-plugin.spec
@@ -1,22 +1,25 @@
# Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173658
%global minorversion 1.0
-
-Name: xfce4-cpugraph-plugin
-Version: 1.0.1
-Release: 7%{?dist}
-Summary: CPU monitor for the Xfce panel
-
-Group: User Interface/Desktops
-License: GPLv2+
-URL: http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: libxfcegui4-devel >= 4.4.0
-BuildRequires: xfce4-panel-devel >= 4.4.0
-BuildRequires: intltool, gettext
-Requires: xfce4-panel >= 4.4.1
+%global xfceversion 4.10
+
+Name: xfce4-cpugraph-plugin
+Version: 1.0.2
+Release: 1%{?dist}
+Summary: CPU monitor 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-cpugraph-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.8.0
+BuildRequires: xfce4-panel-devel >= 4.8.0
+BuildRequires: intltool
+BuildRequires: gettext
+Requires: xfce4-panel >= %{xfceversion}
%description
A CPU monitor plugin for the Xfce panel. It offers multiple display modes
@@ -34,8 +37,15 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+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}
@@ -55,16 +65,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README NEWS
-%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_libdir}/xfce4/panel/plugins/*.so
+%{_datadir}/xfce4/panel/plugins/*.desktop
%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/xfce4/panel-plugins/*.desktop
%changelog
+* Mon Apr 30 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.2-1
+- Update to 1.0.2 (Xfce 4.10 final)
+- Add VCS key
+
* Sun Apr 15 2012 Kevin Fenzi <kevin at scrye.com> - 1.0.1-7
- Rebuild for Xfce 4.10(pre2)
More information about the scm-commits
mailing list