[xfce4-clipman-plugin/el5/master] rewind to 0.9.1 because it is the last version to build on el5

Christoph Wickert cwickert at fedoraproject.org
Sat Jul 31 20:32:54 UTC 2010 

commit 0e6231d8b2bbf6df9784ee15d328a5c512510fb1
Author: Christoph Wickert <fedora at christoph-wickert.de>
Date:   Sat Jul 31 22:20:14 2010 +0200

    rewind to 0.9.1 because it is the last version to build on el5

 .cvsignore                                         |    1 +
 .gitignore                                         |    1 -
 Makefile                                           |   21 ++++
 sources                                            |    2 +-
 ...man-plugin-1.1.3-fix-possible-NULL-values.patch |   26 -----
 xfce4-clipman-plugin.spec                          |  113 +++-----------------
 6 files changed, 40 insertions(+), 124 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..c6e08d9
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1 @@
+xfce4-clipman-plugin-0.9.1.tar.bz2
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a6d7a1b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+# Makefile for source rpm: xfce4-clipman-plugin
+# $Id$
+NAME := xfce4-clipman-plugin
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
index 0166611..04a2b49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ba70c6bd710e2a18cba5add66d297dc  xfce4-clipman-plugin-1.1.3.tar.bz2
+74aa0e707c3e31844518fd36b1498254  xfce4-clipman-plugin-0.9.1.tar.bz2
diff --git a/xfce4-clipman-plugin.spec b/xfce4-clipman-plugin.spec
index cdbe1d4..cb739e1 100644
--- a/xfce4-clipman-plugin.spec
+++ b/xfce4-clipman-plugin.spec
@@ -1,124 +1,45 @@
-Name:           xfce4-clipman-plugin
-Version:        1.1.3
-Release:        2%{?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}/1.1/%{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
-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
+Name:		xfce4-clipman-plugin
+Version:	0.9.1
+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://goodies.xfce.org/releases/%{name}/%{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
+BuildRequires:	exo-devel >= 0.3.0
+BuildRequires:	gettext, intltool, libxml2-devel
+Requires:	xfce4-panel >= 4.4.0
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
 clipboard" option, and a drag-and-drop paste feature.
 
-
 %prep
 %setup -q
-%patch0 -p1 -b .null-value
-
 
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
-desktop-file-install                                      \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-  --add-category=X-Xfce                                   \
-  --delete-original                                       \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-
-desktop-file-install                                      \
-  --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart     \
-  --add-category=X-Xfce                                   \
-  --delete-original                                       \
-  ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog README THANKS
 %{_libexecdir}/xfce4/panel-plugins/%{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
-%{_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/*.desktop
 
 %changelog
-* Thu Jan 07 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.3-2
-- Fix possible NULL values (#552892 and #552895)
-
-* Mon Nov 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.3-1
-- Update to 1.1.3
-
-* Thu Oct 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.1-1
-- Update to 1.1.1
-
-* Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
-- Update to 1.1.0
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jul 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.2-1
-- Update to 1.0.2
-
-* Thu Jun 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-2
-- BR desktop-file-utils
-
-* Thu May 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-1
-- Update to 1.0.1
-
-* Tue Apr 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
-- Update to 1.0.0
-- Require xfce4-doc
-
 * Mon Mar 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.1-2
 - Update to 0.9.1

More information about the scm-commits mailing list