- should work when entranced will be repaired

- FHS compliance entrance_config.db -> /var/lib

Changed files:
    entrance.spec -> 1.3

diff --git a/entrance.spec b/entrance.spec
index 75d2c9c6beefa0a2458fc79eba9fbabfe3d32fde..ae2570c69ca8afc0ee45ddc7e5d8c4ff1008f67f 100644 (file)
--- a/entrance.spec
+++ b/entrance.spec
@@ -3,18 +3,32 @@ Summary(pl):  O
 Name:          entrance
 Version:       0.9.0
 %define _snap  20050106
-Release:       0.%{_snap}.0.1
+Release:       0.%{_snap}.0.5
 License:       BSD
 Group:         X11/Applications
 #Source0:      http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
 Source0:       ftp://ftp.sparky.homelinux.org/pub/e17/%{name}-%{version}-%{_snap}.tar.gz
 # Source0-md5: 22bd32b41c655089ae9a1591da462a01
+Source1:       %{name}.init
+Source2:       %{name}.Xsession
+Source3:       %{name}.gen-conf
+Patch0:                %{name}-conf.in.patch
 URL:           http://enlightenment.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: esmart-devel
 BuildRequires: libtool
 BuildRequires: pam-devel
+BuildRequires: sed >= 4.0
+Requires(post,preun):  /sbin/chkconfig
+Requires:      pam
+Requires:      sessreg
+Requires:      xinitrc-ng
+Obsoletes:     X11-xdm
+Obsoletes:     kdm
+Obsoletes:     gdm
+Obsoletes:     wdm
+Obsoletes:     xdm
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,6 +43,12 @@ jakich KDM czy GDM mog
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
+
+sed '/PACKAGE_CFG_DIR/s@"${sysconfdir}"@"${localstatedir}/lib/${PACKAGE}"@' \
+       -i configure.in
+sed -n '/xsession="You should reconfigure --with-xsession"/!p' \
+       -i configure.in
 
 %build
 %{__libtoolize}
@@ -37,7 +57,7 @@ jakich KDM czy GDM mog
 %{__autoheader}
 %{__automake}
 %configure \
-       --with-xsession=/etc/X11/xdm/Xsession
+       --with-xsession=%{_sysconfdir}/X11/%{name}/Xsession
 %{__make}
 
 %install
@@ -46,15 +66,45 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/X11/%{name},/etc/rc.d/init.d,%{_var}/lib/%{name}}
+install -m 754 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/entrance
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/Xsession
+install -m 755 %{SOURCE3} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/generate-config
+install data/config/build_config.sh.in \
+       $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/
+touch $RPM_BUILD_ROOT%{_var}/lib/%{name}/entrance_config.db
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add entrance
+if [ -f /var/lock/subsys/entrance ]; then
+       echo "Run \"/etc/rc.d/init.d/entrance restart\" to restart entrance." >&2
+else
+       echo "Run \"/etc/rc.d/init.d/entrance start\" to start entrance." >&2
+fi
+
+%preun
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/entrance ]; then
+               /etc/rc.d/init.d/entrance stop >&2
+       fi
+       /sbin/chkconfig --del entrance
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING* README
-%{_sysconfdir}/entrance_config.db
-#%attr(754,root,root) /etc/rc.d/init.d/entrance
+%attr(754,root,root) /etc/rc.d/init.d/entrance
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/entrance
 %attr(755,root,root) %{_bindir}/entrance*
 %attr(755,root,root) %{_sbindir}/entranced
 %{_datadir}/%{name}
+%dir %{_sysconfdir}/X11/%{name}
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/Xsession
+%attr(755,root,root) %{_sysconfdir}/X11/%{name}/generate-config
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/build_config.sh.in
+%dir %{_var}/lib/%{name}
+%ghost %{_var}/lib/%{name}/entrance_config.db