rpms/lxde-common/F-13 lxde-common.spec,1.15,1.16

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31434/F-13

Modified Files:
	lxde-common.spec 
Log Message:
change version to 0.5.0 again as koji would'nt let me build it without new source


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-13/lxde-common.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- lxde-common.spec	12 Dec 2009 00:24:39 -0000	1.15
+++ lxde-common.spec	25 Mar 2010 16:18:12 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           lxde-common
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Default configuration files for LXDE
 
 Group:          User Interface/Desktops
@@ -10,21 +10,34 @@ License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 Source1:        lxde-lock-screen.desktop
+Source2:        lxde-desktop-preferences.desktop
 # http://lxde.svn.sourceforge.net/viewvc/lxde/trunk/lxde-common/startlxde.in?r1=1964&r2=2187
 Patch0:         lxde-common-0.5.0-fix-session-startup.patch
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=847a8e73e658bb9ced5eb7b12242b0064224f49e
+Patch1:         lxde-common-0.5.1-Launch-dbus-in-startlxde-when-needed.patch
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=34cd793a18138463133a72b713173d2d01d32d66
+Patch2:         lxde-common-0.5.1-start-xscreensaver-after-lxpanel-and-pcmanfm.patch
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=28309e598478254fa9c918782cf089aea6358abb
+Patch3:         lxde-common-0.5.1-Ensure-the-existance-of-the-Desktop-folder.patch
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=0f3b683ccd0c208c1f32fae28f628db9e103ccd8
+Patch5:         lxde-common-0.5.1-switch-from-pcmanfm-to-pcmanfm2.patch
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=fcefd17a7187232d15aca13fdedf47a4b854fc21
+Patch7:         lxde-common-0.5.1-Properly-set-XDG_MENU_PREFIX.patch
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=bf7093b8c45c7a38a2f42ddb61135fca7566ff5e
+Patch8:         lxde-common-0.5.1-Fix-config-file-of-pcmanfm2.patch
 # Distro specific patches
-Patch10:        %{name}-0.3.2.1-pcmanfm-config.patch
-Patch11:        %{name}-0.4-lxpanel-config.patch
+Patch10:        %{name}-0.5.1-pcmanfm-config.patch
+Patch11:        %{name}-0.5.0-lxpanel-config.patch
 Patch12:        %{name}-0.4-openbox-menu.patch
 Patch13:        %{name}-0.3.2.1-logout-banner.patch
-Patch14:        %{name}-0.5.0-pulseaudio.patch
+Patch14:        %{name}-0.5.1-pulseaudio.patch
 Patch15:        %{name}-0.5.0-vendor.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 Requires:       lxsession >= 0.4.0
 Requires:       lxpanel pcmanfm openbox xdg-utils 
-Requires:       lxmenu-data lxde-settings-daemon
+Requires:       lxmenu-data
 # Use vendor's artwork
 Requires:       system-logos
 %if 0%{?fedora} < 9
@@ -49,6 +62,12 @@ Desktop Environment.
 %prep
 %setup -q
 %patch0 -p2 -b .session-startup
+%patch1 -p1 -b .dbus
+%patch2 -p1 -b .xscreensaver
+%patch3 -p1 -b .desktop
+%patch5 -p1 -b .pcmanfm2
+%patch7 -p1 -b .menu-prefix
+%patch8 -p1 -b .fix-pcmanfm2
 %patch10 -p1 -b .orig
 %patch11 -p1 -b .orig
 %patch12 -p1 -b .orig
@@ -70,6 +89,8 @@ desktop-file-install                    
 desktop-file-install                                           \
       --dir=%{buildroot}%{_datadir}/applications               \
       %{SOURCE1}
+# cannot use desktop-file-utils because it is out of date
+install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/
 
 
 %clean
@@ -82,6 +103,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/xdg/lxsession/LXDE/
 %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/autostart
 %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/desktop.conf
+%dir %{_sysconfdir}/xdg/pcmanfm/
+%config(noreplace) %{_sysconfdir}/xdg/pcmanfm/lxde.conf
 %{_bindir}/startlxde
 %{_bindir}/lxde-logout
 %{_bindir}/openbox-lxde
@@ -93,6 +116,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 25 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-3
+- Updates for pcmanfm2
+
+* Tue Dec 15 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-2
+- Restore toggle functionality of the show deskop plugin
+- Drop requirement for obsolete lxde-settings-daemon
+
 * Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-1
 - Update to 0.5.0