[xfce4-clipman-plugin] Update to 1.2.2 Enable support for unique

[Christoph Wickert]

commit 3bdc1323f1798825698eae9df754cdb802cade88
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Nov 1 22:34:09 2011 +0100

    Update to 1.2.2
    Enable support for unique

 .gitignore                                         |    2 +
 sources                                            |    2 +-
 ...man-plugin-1.1.3-fix-possible-NULL-values.patch |   26 -------
 xfce4-clipman-plugin-1.1.3-use-exo.patch           |   70 -----------------
 xfce4-clipman-plugin.spec                          |   80 +++++++++++---------
 5 files changed, 46 insertions(+), 134 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a7eca77..3b6b686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 xfce4-clipman-plugin-1.1.3.tar.bz2
+/xfce4-clipman-plugin-1.2.1.tar.bz2
+/xfce4-clipman-plugin-1.2.2.tar.bz2
diff --git a/sources b/sources
index 0166611..c9283e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ba70c6bd710e2a18cba5add66d297dc  xfce4-clipman-plugin-1.1.3.tar.bz2
+60df7769a8271d7fcab177210f4291e8  xfce4-clipman-plugin-1.2.2.tar.bz2
diff --git a/xfce4-clipman-plugin.spec b/xfce4-clipman-plugin.spec
index 63b30ec..f3e9a72 100644
--- a/xfce4-clipman-plugin.spec
+++ b/xfce4-clipman-plugin.spec
@@ -1,33 +1,30 @@
 # Review: https://bugzilla.redhat.com/show_bug.cgi?id=173657
 
-%global minorversion 1.1
+%global minorversion 1.2
+%global xfceversion 4.8.0
 
 Name:           xfce4-clipman-plugin
-Version:        1.1.3
-Release:        4%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        Clipboard manager plugin 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
-# https://bugzilla.redhat.com/show_bug.cgi?id=552892
-# https://bugzilla.redhat.com/show_bug.cgi?id=552895
-# fixed with a rebased version of
-# http://git.xfce.org/panel-plugins/xfce4-clipman-plugin/commit/?id=d06e35ee62a0477adc84b5d7aeb29e348bb0b813
-Patch0:         xfce4-clipman-plugin-1.1.3-fix-possible-NULL-values.patch
-# build with 4.7.x exo
-# http://bugzilla.xfce.org/show_bug.cgi?id=6853
-Patch1:         xfce4-clipman-plugin-1.1.3-use-exo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxfcegui4-devel >= 4.4.0
-BuildRequires:  xfce4-panel-devel >= 4.4.0
-BuildRequires:  exo-devel >= 0.3.0 
-BuildRequires:  libglade2-devel >= 2.6.0
-BuildRequires:  xfconf-devel >= 4.6.0
-BuildRequires:  gettext, intltool, desktop-file-utils
-Requires:       xfce4-panel >= 4.4.0, xfce4-doc
+BuildRequires:  libxfce4ui-devel >= %{xfceversion}
+BuildRequires:  xfce4-panel-devel >= %{xfceversion}
+BuildRequires:  exo-devel >= 0.6.0
+BuildRequires:  xfconf-devel >= %{xfceversion}
+BuildRequires:  xorg-x11-proto-devel >= 7.0.0
+BuildRequires:  libXtst-devel >= 1.0.0
+BuildRequires:  gettext
+BuildRequires:  intltool
+BuildRequires:  desktop-file-utils
+BuildRequires:  unique-devel >= 1.0.0
+Requires:       xfce4-panel >= 4.4.0
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -36,33 +33,32 @@ clipboard" option, and a drag-and-drop paste feature.
 
 %prep
 %setup -q
-%patch0 -p1 -b .null-value
-%patch1 -p1 -b .exo-build
 
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-unique
 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'
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %find_lang %{name}
 
-desktop-file-install                                      \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-  --delete-original                                       \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+desktop-file-install \
+  --dir %{buildroot}%{_datadir}/applications \
+  --delete-original \
+  %{buildroot}%{_datadir}/applications/xfce4-clipman.desktop
 
-desktop-file-install                                      \
-  --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart     \
-  --delete-original                                       \
-  ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
+desktop-file-install \
+  --dir %{buildroot}%{_sysconfdir}/xdg/autostart \
+  --delete-original  \
+  %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -83,20 +79,30 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_libexecdir}/xfce4/panel-plugins/%{name}
+%doc %{_docdir}/%{name}/
 %config %{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-clipman-actions.xml
 %{_bindir}/xfce4-clipman
 %{_bindir}/xfce4-clipman-settings
 %{_bindir}/xfce4-popup-clipman
-%{_datadir}/applications/%{name}.desktop
+%{_libdir}/xfce4/panel/plugins/libclipman*
+%{_datadir}/applications/xfce4-clipman.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/xfce4/doc/*/images/clipman-*.png
-%{_datadir}/xfce4/doc/*/%{name}.html
-%{_datadir}/xfce4/panel-plugins/%{name}.desktop
+%{_datadir}/xfce4/panel/plugins/%{name}.desktop
 
 
 %changelog
+* Tue Nov 01 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.2.2-1
+- Update to 1.2.2
+- Enable support for unique
+
+* Mon Oct 31 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.2.1-1
+- Update to 1.2.1
+- Drop all patches
+- New BR xorg-x11-xproto-devel and libXtst-devel
+- No longer BR libglade2-devel
+- No longer require xfce4-doc (#721291)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild