rpms/xfdesktop/devel xfdesktop-image.patch, NONE, 1.1 xfdesktop.spec, 1.1, 1.2

[Kevin Fenzi (kevin)]

Author: kevin

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

Modified Files:
	xfdesktop.spec 
Added Files:
	xfdesktop-image.patch 
Log Message:
readded xfdesktop-image.patch
reset spec back to the core/devel version


xfdesktop-image.patch:

--- NEW FILE xfdesktop-image.patch ---
diff -Naur xfdesktop-4.0.5.orig/settings/backdrop_settings.c xfdesktop-4.0.5/settings/backdrop_settings.c
--- xfdesktop-4.0.5.orig/settings/backdrop_settings.c	2003-09-19 23:10:59.000000000 +0200
+++ xfdesktop-4.0.5/settings/backdrop_settings.c	2004-04-20 21:00:10.000000000 +0200
@@ -72,7 +72,8 @@
 #define gdk_pixbuf_new_from_inline gdk_pixbuf_new_from_stream
 #endif
 
-#define DEFAULT_BACKDROP (DATADIR "/xfce4/backdrops/xfce-stripes.png")
+/* Use Fedora (tm) default background image */
+#define DEFAULT_BACKDROP (DATADIR "/backgrounds/images/default.png")
 
 /*
  * XXX - No help button for now. Wait for the others to ACK on this.
@@ -216,12 +217,10 @@
     }
     else
     {
-        /* 
-           Just a color by default #336699 - That number looks cool :)
-         */
-        backdrop_color.red   = (guint16) 0x3300;
-        backdrop_color.green = (guint16) 0x6600;
-        backdrop_color.blue  = (guint16) 0x9900;
+        /* Use Fedora (tm) default background color */
+        backdrop_color.red   = (guint16) 0x2600;
+        backdrop_color.green = (guint16) 0x3200;
+        backdrop_color.blue  = (guint16) 0x4c00;
         backdrop_color.alpha = (guint16) 0;
         mcs_manager_set_color(mcs_plugin->manager, "color", BACKDROP_CHANNEL, 
                               &backdrop_color);


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfdesktop.spec	19 Mar 2005 18:27:38 -0000	1.1
+++ xfdesktop.spec	20 Mar 2005 20:17:11 -0000	1.2
@@ -1,25 +1,34 @@
-Summary: Desktop manager for the Xfce Desktop Environment
+Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.2.1
 Release: 1
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xfdesktop-4.2.1.tar.bz2
+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
+
 Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gtk2 >= 2.2.0
-Requires: libxfce4mcs >= 4.2.1
-Requires: libxfcegui4 >= 4.2.1
-BuildRequires: gtk2 >= 2.2.0
-BuildRequires: libxfce4mcs-devel >= 4.2.1
-BuildRequires: libxfcegui4-devel >= 4.2.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: xfce-mcs-manager
+Requires: xfwm4
+Requires: xfce4-panel
+Requires: desktop-backgrounds-basic
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxml2-devel
+BuildRequires: xfce-mcs-manager-devel
 
 %description
-xfdesktop is a desktop manager for the Xfce Desktop Environment
+This package includes a desktop manager for the XFce Desktop Environment
 
 %prep
 %setup -q
 
+#%patch1 -p1 -b .fedora
+
 %build
 %configure
 
@@ -27,7 +36,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.a
+
 %find_lang %{name}
 
 %clean
@@ -36,29 +49,54 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
-%{_sysconfdir}
-%{_bindir}/xfce4-menueditor
-%{_bindir}/xfdesktop
-%{_mandir}/man1/xfdesktop.1.gz
-%{_libdir}/xfce4/*
-%{_datadir}/applications/xfce-backdrop-settings.desktop
-%{_datadir}/applications/xfce-menueditor.desktop
-%{_datadir}/icons/hicolor/32x32/apps/xfce4-backdrop.png
-%{_datadir}/icons/hicolor/32x32/apps/xfce4-menueditor.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-backdrop.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-menueditor.png
-%{_datadir}/icons/hicolor/scalable/apps/xfce4-backdrop.svg
-%{_datadir}/icons/hicolor/scalable/apps/xfce4-menueditor.svg
-%{_datadir}/pixmaps/*
+%{_sysconfdir}/xdg/xfce4/*
+%{_bindir}/*
 %{_datadir}/xfce4/*
+%{_libdir}/xfce4/mcs-plugins/*
+%{_libdir}/xfce4/modules/*
+%{_libdir}/xfce4/panel-plugins/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/pixmaps/*
+%{_mandir}/man1/*
 
 %changelog
 * Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Updated to 4.2.1 version
 
-* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+* Thu Jan 27 2005 Than Ngo <than at redhat.com> 4.2.0-1
+- 4.2.0
+
+* Wed Sep 01 2004 Than Ngo <than at redhat.com> 4.0.6-2
+- get rid useless static library #131485
+
+* Tue Jul 20 2004 Than Ngo <than at redhat.com> 4.0.6-1
+- update to 4.0.6
+- fix bug #122743, #124951, #125058
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Apr 20 2004 Than Ngo <than at redhat.com> 4.0.5-2
+- Change defaults for fedora, thanks to Olivier Fourdan <fourdan at xfce.org>
+
+* Thu Apr 15 2004 Than Ngo <than at redhat.com> 4.0.5-1
+- update to 4.0.5
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Jan 27 2004 Than Ngo <than at redhat.com> 4.0.3-2
+- fixed dependant libraries check on x86_64
+
+* Wed Jan 14 2004 Than Ngo <than at redhat.com> 4.0.3-1
+- 4.0.3 release
+
+* Thu Dec 25 2003 Than Ngo <than at redhat.com> 4.0.2-1
+- 4.0.2 release
 
-* Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1
-- Inital Fedora Extras version
+* Tue Dec 16 2003 Than Ngo <than at redhat.com> 4.0.1-1
+- initial build