git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5659 ec354946-7b23-47d6-9f5a-488ba84defc7

l/lxde-common/lxde-common-vl.spec

@@ -1,6 +1,6 @@
 Name:           lxde-common
-Version:        0.5.0
-Release:        3%{?_dist_release}
+Version:        0.5.5
+Release:        1%{?_dist_release}
 Summary:        The default settings configuration files of LXDE
 
 Summary(ja):    LXDE のデフォルト設定ファイル
@@ -8,20 +8,18 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+Source1:        lxde-desktop-preferences.desktop
+Source2:        lxde-screenlock.desktop
 
-Patch0:         %{name}-0.5.0-lxpanel-config.patch
-Patch1:         %{name}-0.4-openbox.patch
-Patch2:         %{name}-0.3.2.1-pcmanfm.patch
+#Vine specific customize
+Patch0:         %{name}-0.5.5-lxpanel-config.patch
+Patch1:         %{name}-0.5.5-pcmanfm-config.patch
+Patch2:         %{name}-0.5.5-openbox-menu.patch
+Patch3:         %{name}-lxde-logout.patch
 
-# Because of new gdm
-# http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?24:mss:5608:200804:keopkmedognljeggknac
-Patch3:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
-
-# Pulseaudio
-Patch4:         %{name}-0.5.0-pulseaudio.patch
-
-#Patch5:         %{name}-0.4-lxde-logout.desktop.patch
-Patch6:         lxde-common-0.5.0-fix-session-startup.patch
+Patch11:        10_ensure-dbus-launch.patch
+Patch12:        11_ensure-desktop-folder.patch
+Patch13:        13_ensure-menu-prefix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
@@ -32,6 +30,10 @@ Requires:       lxsession >= 0.4.0
 Requires:       lxpanel pcmanfm openbox xdg-utils xorg-x11-xsm
 Requires:       lxmenu-data
 Requires:       lxde-icon-theme
+Requires:       xscreensaver
+
+# needed because of new gdm
+Requires:       xorg-x11-utils
 
 Obsoletes:      %{name}-data <= 0.4.2
 
@@ -48,10 +50,10 @@ to integrate icons and artwork of LXDE.
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
-%patch3 -p1 -b .gdm-desktops
-%patch4 -p1 -b .pulseaudio
-#%patch5 -p1 -b .orig
-%patch6 -p2 -b .session-startup
+%patch3 -p1 -b .orig
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 %configure
@@ -61,11 +63,15 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 # only used by obsolete lxsession, not lxsession-lite
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
+#rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
 
 desktop-file-install                                           \
       --dir=$RPM_BUILD_ROOT%{_datadir}/applications            \
       lxde-logout.desktop
+desktop-file-install                                           \
+      --dir=%{buildroot}%{_datadir}/applications               \
+      %{SOURCE2}
+install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +83,9 @@ 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/pcmanfm.conf
+
 %{_bindir}/startlxde
 %{_bindir}/lxde-logout
 %{_bindir}/openbox-lxde
@@ -87,6 +96,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/lxde-*.desktop
 
 %changelog
+* Wed Feb 15 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.5.5-1
+- new upstream release
+- removed patch1-6
+  - recreated and renumbered patch 0,1,2,3
+- added Patch11,12,13 from Debian sid
+- added Source1,2 from Fedora rawhide
+  - modified a little
+- added Requires: xscreensaver
+
 * Mon May 10 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.5.0-3
 - recreated and renamed Patch0
 - dropt Requires: lxde-settings-daemon

r/rxvt-unicode/rxvt-unicode-vl.spec

@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        9.15
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 Summary(ja):    Rxvt-unicode は rxvt のユニコードバージョンです
 
@@ -75,7 +75,7 @@ Exec=urxvt
 Icon=/usr/share/pixmaps/urxvt.xpm
 Terminal=false
 Type=Application
-Categories=Application;System;
+Categories=Application;System;TerminalEmulator;
 EOF
 
 desktop-file-install \
@@ -105,6 +105,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/pixmaps/urxvt.xpm
 
 %changelog
+* Wed Feb 15 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 9.15-2
+- fixed desktop entry
+  - readied for using openbox menu
+
 * Wed Jan 25 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 9.15-1
 - new upstream release
 - fixed URL

x/xscreensaver/xscreensaver-vl.spec

@@ -12,7 +12,7 @@ Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Summary:         X screen saver and locker
 Summary(ja):     X ウィンドウシステム・スクリーンセーバ
 Name:            xscreensaver
-Version:         5.12
+Version:         5.15
 Release:         1%{?_dist_release}
 Epoch:		 1
 License:         BSD
@@ -529,6 +529,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Feb 15 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 5.15-1
+- new upstream release
+
 * Sun Oct 31 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.12-1
 - new upstream release