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

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

@@ -1,5 +1,5 @@
 Name:           lxde-common
-Version:        0.4.2
+Version:        0.5.0
 Release:        2%{?_dist_release}
 Summary:        The default settings configuration files of LXDE
 
@@ -7,7 +7,7 @@ Summary(ja):    LXDE のデフォルト設定ファイル
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 
 Patch0:         %{name}-0.4-lxpanel-config.patch
 Patch1:         %{name}-0.4-openbox.patch
@@ -18,17 +18,20 @@ Patch2:         %{name}-0.3.2.1-pcmanfm.patch
 Patch3:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
 
 # Pulseaudio
-Patch4:         %{name}-0.4-pulseaudio.patch
+Patch4:         %{name}-0.5.0-pulseaudio.patch
 
-Patch5:         %{name}-0.4-lxde-logout.desktop.patch
+#Patch5:         %{name}-0.4-lxde-logout.desktop.patch
+Patch6:         lxde-common-0.5.0-fix-session-startup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig glib2-devel libX11-devel
-Requires:       lxsession lxpanel pcmanfm openbox xdg-utils xorg-x11-xsm
+Requires:       lxsession >= 0.4.0
+Requires:       lxpanel pcmanfm openbox xdg-utils xorg-x11-xsm
 Requires:       lxmenu-data lxde-settings-daemon
+Requires:       lxde-icon-theme
 
 Obsoletes:      %{name}-data <= 0.4.2
 
@@ -40,21 +43,6 @@ to integrate icons and artwork of LXDE.
 このパッケージは LXDE - the Lightweight X11 Desktop Environment - の
 アイコンやアートワークを調和するためにシステムの動作や機能を管理します。
 
-%package -n     lxde-icon-theme
-Summary:        Default icon theme for LXDE
-Group:          User Interface/Desktops
-License:        LGPLv3
-URL:            http://nuovext.pwsp.net/
-
-%description -n lxde-icon-theme
-nuoveXT is a very complete set of icons for Linux, Mac OS X and Windows. It is
-also the default icon-theme of LXDE, the Lightweight X11 Desktop Environment.
-
-%description -n lxde-icon-theme -l ja
-nuoveXT は Linux や Mac OS X、Windows 用の完全なアイコンセットです。
-LXDE - the Lightweight X11 Desktop Environment - の
-デフォルトのアイコンテーマでもあります。
-
 %prep
 %setup -q
 %patch0 -p1 -b .orig
@@ -62,7 +50,8 @@ LXDE - the Lightweight X11 Desktop Environment - の
 %patch2 -p1 -b .orig
 %patch3 -p1 -b .gdm-desktops
 %patch4 -p1 -b .pulseaudio
-%patch5 -p1 -b .orig
+#%patch5 -p1 -b .orig
+%patch6 -p2 -b .session-startup
 
 %build
 %configure
@@ -75,32 +64,19 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
 
 desktop-file-install                                           \
-      --dir=$RPM_BUILD_ROOT%{_datadir}/applications               \
+      --dir=$RPM_BUILD_ROOT%{_datadir}/applications            \
       lxde-logout.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lxde-icon-theme
-touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null || :
-
-
-%postun -n lxde-icon-theme
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
-fi
-
-%posttrans -n lxde-icon-theme
-gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %dir %{_sysconfdir}/xdg/lxsession/LXDE/
 %config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/autostart
-%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/config
+%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/desktop.conf
 %{_bindir}/startlxde
 %{_bindir}/lxde-logout
 %{_bindir}/openbox-lxde
@@ -110,13 +86,19 @@ gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
 %{_datadir}/xsessions/LXDE.desktop
 %{_datadir}/applications/lxde-*.desktop
 
-%files -n lxde-icon-theme
-%doc icon-theme/AUTHORS icon-theme/COPYING
-%defattr(-,root,root,-)
-%{_datadir}/icons/nuoveXT2/
+%changelog
+* Sat Mar 13 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.5.0-2
+- applied new naming policy to spec
 
+* Thu Mar 4 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.5.0-1
+- new upstream release
+- replaced patch4 from Fedora
+- dropt Patch5
+- added Patch6 from Fedora
+- added Requires: lxde-icon-theme
+- changed Requires: lxsession >= 0.4.0
+- don't generate lxde-icon-theme in this package 
 
-%changelog
 * Wed Aug 5 2009 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.4.2-2vl5
 - cleaned up spec
 - added Patch4 again