- added Provides: gnome-wm

[packages/sawfish.git] / sawfish.spec

diff --git a/sawfish.spec b/sawfish.spec
index d962533a823d32a797ddde9d6a59da0e7d4b9f13..0218d83b5a8ed985bdd9316490f846c29b1ef222 100644 (file)
--- a/sawfish.spec
+++ b/sawfish.spec
@@ -6,22 +6,24 @@ Summary(ru):  
 Summary(uk):   ÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X Window
 Summary(zh_CN):        ¾ßÓкÜÇ¿µÄÀ©Õ¹ÐԺͿÉÅäÖÃÐÔµÄͼÐδ°¿Ú¹ÜÀíÆ÷
 Name:          sawfish
-Version:       1.2
+Version:       1.3
 Release:       2
 Epoch:         3
 License:       GPL
 Group:         X11/Window Managers
 #Source0:      http://ftp.gnome.org/pub/gnome/sources/sawfish/2.0/%{name}-%{version}.tar.bz2
-Source0:       http://unc.dl.sourceforge.net/sourceforge/sawmill/%{name}-%{version}-gtk2.tar.gz
+Source0:       http://dl.sourceforge.net/sawmill/%{name}-%{version}.tar.gz
+# Source0-md5: 9e5ce5e76c60acecdb1889c1f173295a
+Source1:       %{name}-xsession.desktop
 Patch0:                %{name}-applnk.patch
 URL:           http://sawmill.sourceforge.net/
 Icon:          sawfish.xpm
-BuildRequires: autoconf                
+BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: esound-devel >= 0.2.27
 BuildRequires: gettext-devel
-BuildRequires: librep-devel >= 0.16
 BuildRequires: gtk+2-devel >= 2.0.3
+BuildRequires: librep-devel >= 0.16
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
@@ -32,13 +34,14 @@ BuildRequires:      texinfo
 %define                repexecdir      %(rep-config --execdir || echo "Install_librep-devel_and_rebuild_this_package")
 Requires:      rep-gtk >= 0.16
 Requires:      %{repexecdir}
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Provides:      gnome-wm
 Obsoletes:     sawmill
 Obsoletes:     sawmill-gnome
 Obsoletes:     sawmill-themer
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _libexecdir     %{_libdir}
-%define                _wmpropsdir     %{_datadir}/wm-properties
+%define                _wmpropsdir     /usr/share/wm-properties
 
 %description
 This is an extensible window manager using a LISP-based scripting
@@ -86,7 +89,7 @@ sawfish-gnome.
 Summary:       GNOME support for sawmill
 Summary(pl):   Support GNOME'a dla sawmilla
 Group:         X11/Window Managers
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
 Requires:      rep-gtk-gnome >= 0.14-3
 Requires:      rep-gtk-libglade >= 0.14-3
 
@@ -111,13 +114,13 @@ control-center oraz specyfikacj
 ÐÁËÅÔ.
 
 %prep
-%setup -q -n %{name}-%{version}-gtk2
+%setup -q
 %patch0 -p1
 
 %build
 %{__gettextize}
 %{__libtoolize}
-aclocal
+%{__aclocal}
 %{__autoconf}
 %{__automake} || :
 %configure \
@@ -129,11 +132,12 @@ aclocal
        --with-esd \
        --with-audiofile \
        --with-gnu-ld
-%{__make} host_type=%{_host}
+%{__make} \
+       host_type=%{_host}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_wmpropsdir}
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_wmpropsdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -141,6 +145,7 @@ install -d $RPM_BUILD_ROOT%{_wmpropsdir}
        host_type=%{_host}
 
 install Sawfish.desktop $RPM_BUILD_ROOT%{_wmpropsdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
 
 %find_lang %{name}
 
@@ -158,6 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README NEWS FAQ TODO
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/sawfish
+%{_datadir}/xsessions/%{name}.desktop
 %{_pixmapsdir}/*
 
 %dir %{_libexecdir}/sawfish