rpms/xfdesktop/devel xfdesktop-image-4.2.1.patch, NONE, 1.1 xfdesktop.spec, 1.4, 1.5

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16286

Modified Files:
	xfdesktop.spec 
Added Files:
	xfdesktop-image-4.2.1.patch 
Log Message:
Removed unneeded a/la files
Rediffed xfdesktop-image patch against current version and applied


xfdesktop-image-4.2.1.patch:

--- NEW FILE xfdesktop-image-4.2.1.patch ---
diff -Nur xfdesktop-4.2.1.orig/common/xfdesktop-common.h xfdesktop-4.2.1/common/xfdesktop-common.h
--- xfdesktop-4.2.1.orig/common/xfdesktop-common.h	2005-01-09 14:18:36.000000000 -0700
+++ xfdesktop-4.2.1/common/xfdesktop-common.h	2005-03-23 13:31:20.448625169 -0700
@@ -28,7 +28,8 @@
 #include <glib.h>
 
 #define BACKDROP_CHANNEL         "BACKDROP"
-#define DEFAULT_BACKDROP         DATADIR "/xfce4/backdrops/xfce-smoke.png"
+/* Use Fedora (tm) default background image */
+#define DEFAULT_BACKDROP         DATADIR "/backgrounds/images/default.png"
 #define LIST_TEXT                "# xfce backdrop list"
 #define XFDESKTOP_SELECTION_FMT  "XFDESKTOP_SELECTION_%d"
 #define XFDESKTOP_IMAGE_FILE_FMT "XFDESKTOP_IMAGE_FILE_%d"
diff -Nur xfdesktop-4.2.1.orig/settings/backdrop_settings.c xfdesktop-4.2.1/settings/backdrop_settings.c
--- xfdesktop-4.2.1.orig/settings/backdrop_settings.c	2005-01-10 03:05:16.000000000 -0700
+++ xfdesktop-4.2.1/settings/backdrop_settings.c	2005-03-23 13:33:09.725725691 -0700
@@ -242,10 +242,10 @@
 				bp->color1.blue = setting->data.v_color.blue;
 				bp->color1.alpha = setting->data.v_color.alpha;
 			} else {
-				/* Just a color by default #1f3f6f - That number looks cool :) */
-				bp->color1.red = (guint16)0x1f00;
-				bp->color1.green = (guint16)0x3f00;
-				bp->color1.blue = (guint16)0x6f00;
+                                /* Use Fedora (tm) default background color */
+                               bp->color1.red = (guint16) 0x2600;
+                               bp->color1.green = (guint16) 0x3200;
+                               bp->color1.blue  = (guint16) 0x4c00;
 				bp->color1.alpha = (guint16)0xffff;
 				mcs_manager_set_color(mcs_plugin->manager, setting_name,
 						BACKDROP_CHANNEL, &bp->color1);


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfdesktop.spec	20 Mar 2005 22:41:19 -0000	1.4
+++ xfdesktop.spec	23 Mar 2005 20:46:53 -0000	1.5
@@ -1,13 +1,13 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.2.1
-Release: 1.FC4
+Release: 2.FC4
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz/xfdesktop-4.2.1.tar.bz2
 
 # Change default for Fedora
-Patch1: xfdesktop-image.patch
+Patch0: xfdesktop-image-4.2.1.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 
-#%patch1 -p1 -b .fedora
+%patch0 -p1 -b .fedora
 
 %build
 %configure
@@ -38,9 +38,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.la
 
 %find_lang %{name}
 
@@ -62,6 +63,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Mar 23 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-2.FC4
+- Removed unneeded a/la files
+- Rediffed xfdesktop-image patch against current version and applied
+
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version