dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-xfce-mcs-plugins-4.4.1.tar.bz2

.gitignore

@@ -0,0 +1 @@
+xfce-mcs-plugins-4.4.2.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce-mcs-plugins
-# $Id$
-NAME := xfce-mcs-plugins
-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)

sources

@@ -1 +1 @@
-99f05b5ce95f24c205731565210aa8a9  xfce-mcs-plugins-4.4.1.tar.bz2
+77fcc929058de530d4f91eb25de851a1  xfce-mcs-plugins-4.4.2.tar.bz2

xfce-mcs-plugins-4.4.2-fedora.patch

@@ -0,0 +1,14 @@
+--- xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c.orig	2007-12-01 20:56:27.000000000 +0100
++++ xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c	2007-12-01 20:59:17.000000000 +0100
+@@ -131,9 +131,9 @@
+ #define RCFILE  "gtk.xml"
+ #define CHANNEL "settings"
+ #define PLUGIN_NAME "ui"
+-#define DEFAULT_THEME "Default"
++#define DEFAULT_THEME "Clearlooks"
+ #define INITIAL_THEME "Xfce"
+-#define DEFAULT_ICON_THEME "hicolor"
++#define DEFAULT_ICON_THEME "Fedora"
+ #define INITIAL_ICON_THEME "Rodent"
+ #define DEFAULT_TOOLBAR_STYLE "icons"
+ #define DEFAULT_FONT "Sans 9"

xfce-mcs-plugins-4.4.2-mouse.patch

@@ -0,0 +1,29 @@
+diff -Nur xfce-mcs-plugins-4.4.2.orig/plugins/mouse_plugin/mouse_plugin.c xfce-mcs-plugins-4.4.2/plugins/mouse_plugin/mouse_plugin.c
+--- xfce-mcs-plugins-4.4.2.orig/plugins/mouse_plugin/mouse_plugin.c	2007-11-17 12:31:23.000000000 -0700
++++ xfce-mcs-plugins-4.4.2/plugins/mouse_plugin/mouse_plugin.c	2007-12-17 17:51:03.000000000 -0700
+@@ -174,7 +174,7 @@
+     unsigned char *buttons;
+     gint n_buttons, n_devices, i;
+     gint idx_1 = 0, idx_3 = 1;
+-    gsize buttons_capacity = 16;
++    gsize buttons_capacity = DEFAULT_PTR_MAP_SIZE;
+ 
+     device_info = XListInputDevices (GDK_DISPLAY (), &n_devices);
+ 
+@@ -204,11 +204,12 @@
+             continue;
+         }
+ 
+-        n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, DEFAULT_PTR_MAP_SIZE);
+-        if (n_buttons > DEFAULT_PTR_MAP_SIZE)
++	n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity);
++	if (n_buttons > buttons_capacity)
+         {
+-            buttons = g_alloca (n_buttons);
+-            n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, n_buttons);
++		buttons = g_realloc (buttons, n_buttons);
++		buttons_capacity = n_buttons;
++		n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity);
+         }
+ 
+         for (i = 0; i < n_buttons; i++)

xfce-mcs-plugins.spec

@@ -1,12 +1,12 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
-Version: 4.4.1
-Release: 3%{?dist}
+Version: 4.4.2
+Release: 2%{?dist}
 License: GPLv2
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2
-Patch: xfce-mcs-plugins-4.2.0-rh.patch
-Patch1: xfce-mcs-plugins-4.4.1-dpi.patch
+Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2
+Patch: xfce-mcs-plugins-4.4.2-fedora.patch
+Patch1: xfce-mcs-plugins-4.4.2-mouse.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xfce-mcs-manager >= %{version}
@@ -25,8 +25,8 @@ settings manager.
 
 %prep
 %setup -q
-%patch -p1 -b .fedora
-%patch1 -p1 -b .dpi
+%patch -p1 -b .theme
+%patch1 -p1 -b .mouse
 
 %build
 %configure
@@ -56,6 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Mon Dec 17 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.2-2
+- Add patch for mouse button crash (fixes #425925)
+
+* Sun Nov 18 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.2-1
+- Update to 4.4.2
+
 * Mon Aug 27 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.1-3
 - Update License tag