[xfce4-datetime-plugin] Update to 0.6.2

[Christoph Wickert]

commit e3c308f9039a7a304ab0b23bddd7a77ad1521707
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Feb 14 23:34:30 2013 +0100

    Update to 0.6.2
    
    - Remove all patches (either upstreamed or obsolete)
    - Add VCS key

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 xfce4-datetime-plugin-0.5.0-multilib.patch         |   11 -
 xfce4-datetime-plugin-0.6.1-tooltips.patch         |   24 -
 ...datetime-plugin-0.6.1-update-translations.patch | 4586 --------------------
 xfce4-datetime-plugin-0.6.1-xfce4-panel-4.7.patch  |   25 -
 xfce4-datetime-plugin.spec                         |   58 +-
 7 files changed, 34 insertions(+), 4673 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a41900e..b3dfb9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xfce4-datetime-plugin-0.6.1.tar.bz2
+/xfce4-datetime-plugin-0.6.2.tar.bz2
diff --git a/sources b/sources
index d3e2900..f61e751 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e82f51ff0e75a63e5cbd139e43e094f9  xfce4-datetime-plugin-0.6.1.tar.bz2
+fe604a251eadbc5b0f2b4737b85d92c8  xfce4-datetime-plugin-0.6.2.tar.bz2
diff --git a/xfce4-datetime-plugin.spec b/xfce4-datetime-plugin.spec
index 9358295..851638e 100644
--- a/xfce4-datetime-plugin.spec
+++ b/xfce4-datetime-plugin.spec
@@ -1,28 +1,28 @@
+%global minorversion 0.6
+
+%if 0%{?fedora} >= 18
+    %global xfceversion 4.10
+%else
+    %global xfceversion 4.8
+%endif
+
 Name:           xfce4-datetime-plugin
-Version:        0.6.1
-Release:        12%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        Date/time plugin for the Xfce panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:        xfce4-datetime-plugin-0.6.1-xfce4-panel-4.7.patch
-# http://git.xfce.org/panel-plugins/xfce4-datetime-plugin/commit/?id=7770996215eeca0f5e5f89bdcc4df94acc1d9415
-Patch1:         xfce4-datetime-plugin-0.6.1-tooltips.patch
-# contains all translations from 
-# http://translations.xfce.org/projects/p/xfce4-dateime-plugin/c/master/ 
-# as of 2010-12-18
-Patch2:         xfce4-datetime-plugin-0.6.1-update-translations.patch
-# http://bugzilla.xfce.org/show_bug.cgi?id=6443
-#Patch3:         xfce4-datetime-plugin-0.6.1-port-to-libxfce4ui.patch
+#VCS: git:git://git.xfce.org/panel-plugins/xfce4-datetime-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.3.99.2
-BuildRequires:  libxfcegui4-devel >= 4.3.99.2
-BuildRequires:  libxml2-devel
-BuildRequires:  gettext, intltool
-Requires:       xfce4-panel >= 4.4.0
+BuildRequires:  libxfce4ui-devel >= 4.8.0
+BuildRequires:  xfce4-panel-devel >= 4.8.0
+BuildRequires:  gettext
+BuildRequires:  intltool
+Requires:       xfce4-panel >= %{xfceversion}
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -31,11 +31,6 @@ left-click on it.
 
 %prep
 %setup -q
-%patch0 -p1 -b .xfce4-panel-4.7
-%patch1 -p1 -b .tooltips
-%patch2 -p1 -b .update-translations
-#%patch3 -p1 -b .port-to-libxfce4ui
-#autoreconf
 
 
 %build
@@ -44,9 +39,15 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+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}
 
 
@@ -58,10 +59,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS THANKS
 %{_libdir}/xfce4/panel/plugins/*.so
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/xfce4/panel/plugins/*.desktop
 
 
 %changelog
+* Thu Feb 14 2013 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.2-1
+- Update to 0.6.2
+- Remove all patches (either upstreamed or obsolete)
+- Add VCS key
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild