[xfce4-fsguard-plugin] Update to 1.0.1

Christoph Wickert cwickert at fedoraproject.org
Sat Jun 30 22:54:23 UTC 2012


commit 228877414dddd776c1acaaaadc8669e3817c88da
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Jul 1 00:54:21 2012 +0200

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

 .gitignore                |    1 +
 sources                   |    2 +-
 xfce4-fsguard-plugin.spec |   47 ++++++++++++++++++++++++++++++++------------
 3 files changed, 36 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 694cac4..b99e1d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xfce4-fsguard-plugin-0.4.2.tar.bz2
 /xfce4-fsguard-plugin-1.0.0.tar.bz2
+/xfce4-fsguard-plugin-1.0.1.tar.bz2
diff --git a/sources b/sources
index dc13da5..77bb4ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8378f922b59a0d5a378af5e45a18c4a3  xfce4-fsguard-plugin-1.0.0.tar.bz2
+9c179371475e2837004cc208026e30c1  xfce4-fsguard-plugin-1.0.1.tar.bz2
diff --git a/xfce4-fsguard-plugin.spec b/xfce4-fsguard-plugin.spec
index 3e721ff..d714d9e 100644
--- a/xfce4-fsguard-plugin.spec
+++ b/xfce4-fsguard-plugin.spec
@@ -1,19 +1,29 @@
-%global minor_version 1.0
+# review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173661
+
+%global minorversion 1.0
+%if 0%{?fedora} >= 18
+    %global xfceversion 4.10
+%else
+    %global xfceversion 4.8
+%endif
 
 Name:           xfce4-fsguard-plugin
-Version:        1.0.0
-Release:        7%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        Filesystem-Guard 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-fsguard-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.4.0, libxfcegui4-devel >= 4.4.0, libxml2-devel
-BuildRequires:  gettext, intltool, perl(XML::Parser)
-Requires:       xfce4-panel >= 4.4.1
+BuildRequires:  libxfce4ui-devel >= 4.8.0
+BuildRequires:  xfce4-panel-devel >= 4.8.0
+BuildRequires:  gettext
+BuildRequires:  intltool
+Requires:       xfce4-panel >= %{xfceversion}
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -32,8 +42,15 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# remove la file
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
+# make sure debuginfo is generated properly
+chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
+
 %find_lang %{name}
 
 
@@ -53,18 +70,22 @@ 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 NEWS README
-%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_libdir}/xfce4/panel/plugins/*.so
+%{_datadir}/xfce4/panel/plugins/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/xfce4/panel-plugins/*.desktop
-
 
 %changelog
+* Sat Jun 30 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-1
+- Update to 1.0.1
+- Define the Xfce version conditionally
+- Add review # and VCS key
+
 * Sun Apr 15 2012 Kevin Fenzi <kevin at scrye.com> - 1.0.0-7
 - Rebuild for Xfce 4.10(pre2)
 


More information about the scm-commits mailing list