rpms/xfce4-settings/EL-5 xfce4-settings.spec,1.27,1.28

[Kevin Fenzi]

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-settings/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12552

Modified Files:
	xfce4-settings.spec 
Log Message:
Disable libcanberra/sounds 
Add vendor key



Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/EL-5/xfce4-settings.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xfce4-settings.spec	22 May 2010 04:25:05 -0000	1.27
+++ xfce4-settings.spec	26 Jul 2010 03:31:31 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name:           xfce4-settings
 Version:        4.6.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -26,7 +26,6 @@ BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
 BuildRequires: desktop-file-utils >= 0.7
 BuildRequires: libnotify-devel
-BuildRequires: libcanberra-devel
 BuildRequires: libxklavier-devel
 Requires: xfconf
 
@@ -45,7 +44,7 @@ This package includes the settings manag
 %patch10 -p1 -b .vendor
 
 %build
-%configure --enable-sound-settings
+%configure 
 make %{?_smp_mflags}
 
 
@@ -54,43 +53,49 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install                                            \
+        --vendor=''                                             \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-display-settings.desktop
 
 desktop-file-install                                            \
+        --vendor=''                                             \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-keyboard-settings.desktop
 
 desktop-file-install                                            \
+        --vendor=''                                             \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-mouse-settings.desktop
 
 desktop-file-install                                            \
+        --vendor=''                                             \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
-        --remove-key="Encoding"                                 \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-settings-manager.desktop
 
 desktop-file-install                                            \
+        --vendor=''                                             \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-ui-settings.desktop
 
 desktop-file-install                                            \
+        --vendor=''                                             \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-accessibility-settings.desktop
 
 desktop-file-install                                            \
+        --vendor=''                                             \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
-        --remove-key="Encoding"                                 \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-settings-editor.desktop
 
 desktop-file-install                                            \
+        --vendor=''                                             \
         --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/    \
         --delete-original                                       \
         --add-only-show-in=XFCE                                 \
@@ -120,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Sun Jul 25 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.5-2
+- Disable libcanberra/sounds 
+- Add vendor key
+
 * Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.5-1
 - Update to 4.6.5