rpms/xfce-mcs-plugins/FC-3 xfce-mcs-plugins-4.2.0-rh.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce-mcs-plugins.spec, 1.6, 1.7 xfce-mcs-plugin-fedora.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/xfce-mcs-plugins/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv25953/FC-3

Modified Files:
	.cvsignore sources xfce-mcs-plugins.spec 
Added Files:
	xfce-mcs-plugins-4.2.0-rh.patch 
Removed Files:
	xfce-mcs-plugin-fedora.patch 
Log Message:
auto-import xfce-mcs-plugins-4.2.1-2.FC3 on branch FC-3 from xfce-mcs-plugins-4.2.1-2.FC3.src.rpm

xfce-mcs-plugins-4.2.0-rh.patch:
 ui_plugin.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xfce-mcs-plugins-4.2.0-rh.patch ---
--- xfce-mcs-plugins-4.2.0/plugins/ui_plugin/ui_plugin.c.orig	2004-12-27 20:05:36.000000000 +0100
+++ xfce-mcs-plugins-4.2.0/plugins/ui_plugin/ui_plugin.c	2005-01-24 11:01:02.291654459 +0100
@@ -118,8 +118,8 @@
 #define CHANNEL "settings"
 #define PLUGIN_NAME "ui"
 #define DEFAULT_THEME "Default"
-#define INITIAL_THEME "Xfce"
-#define DEFAULT_ICON_THEME "hicolor"
+#define INITIAL_THEME "Bluecurve"
+#define DEFAULT_ICON_THEME "Bluecurve"
 #define INITIAL_ICON_THEME "Rodent"
 #define DEFAULT_TOOLBAR_STYLE "icons"
 #define DEFAULT_FONT "Sans 9"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xfce-mcs-plugins/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 14:42:19 -0000	1.4
+++ .cvsignore	20 Mar 2005 21:10:29 -0000	1.5
@@ -1 +1 @@
-xfce-mcs-plugins-4.0.6.tar.gz
+xfce-mcs-plugins-4.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xfce-mcs-plugins/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 14:42:19 -0000	1.4
+++ sources	20 Mar 2005 21:10:29 -0000	1.5
@@ -1 +1 @@
-e197d3570f444daa175a684e472ea396  xfce-mcs-plugins-4.0.6.tar.gz
+f53711b93e28b6751f18f6346d4194e2  xfce-mcs-plugins-4.2.1.tar.bz2


Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/xfce-mcs-plugins/FC-3/xfce-mcs-plugins.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce-mcs-plugins.spec	9 Sep 2004 14:42:28 -0000	1.6
+++ xfce-mcs-plugins.spec	20 Mar 2005 21:10:29 -0000	1.7
@@ -1,25 +1,20 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
-Version: 4.0.6
-Release: 2
+Version: 4.2.1
+Release: 2.FC3
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.0.6/src/%{name}-%{version}.tar.gz
-
-Patch: xfce-mcs-plugin-fedora.patch
-
+Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfce-mcs-plugins-4.2.1.tar.bz2
+Patch: xfce-mcs-plugins-4.2.0-rh.patch
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-Requires: gtk2 >= 2.0.6
-Requires: xfce-mcs-manager >= 4.0.5
-
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: xfce-mcs-manager >= %{version}
 BuildRequires: gettext
 BuildRequires: gtk2-devel >= 2.0.6
-BuildRequires: xfce-mcs-manager-devel >= 4.0.5
-BuildRequires: libxfcegui4-devel >= 4.0.5
-BuildRequires: libxfce4util-devel >= 4.0.5
-BuildRequires: libxfce4mcs-devel >= 4.0.5
+BuildRequires: xfce-mcs-manager-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxfce4util-devel >= %{version}
+BuildRequires: libxfce4mcs-devel >= %{version}
 
 %description
 This package inlcudes a set of plugins for the multi channel
@@ -27,7 +22,6 @@
 
 %prep
 %setup -q
-
 %patch -p1 -b .fedora
 
 %build
@@ -48,10 +42,26 @@
 %doc README TODO COPYING AUTHORS
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C
-%lang(fr) %{_datadir}/xfce4/doc/fr/
 %{_libdir}/xfce4/mcs-plugins/*
+%{_datadir}/applications/*
+%{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Sat Mar 19 2005 Warren Togami <wtogami at redhat.com> - 4.2.1-2
+- remove explicit gtk2 req
+
+* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
+- Updated to 4.2.1 version
+
+* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
+- Capitalized first letter of Summary in devel section to quiet rpmlint
+
+* Mon Jan 24 2005 Than Ngo <than at redhat.com> 4.2.0-1
+- 4.2.0
+
+* Wed Dec 08 2004 Than Ngo <than at redhat.com> 4.1.99.1-1
+- update to 4.2 rc1
+
 * Thu Sep 02 2004 Than Ngo <than at redhat.com> 4.0.6-2
 - use find_lang macro
 - cleanup specfile


--- xfce-mcs-plugin-fedora.patch DELETED ---