- Fixed iconpath in defines.m4

- Removed useless xdm session file

Changed files:
    AnotherLevel.spec -> 1.28

diff --git a/AnotherLevel.spec b/AnotherLevel.spec
index 5a3d748e544326190b414ef4d6b140e3144bea12..cc6eda90a21ecfa64805aa4b93616e8dded7c259 100644 (file)
--- a/AnotherLevel.spec
+++ b/AnotherLevel.spec
@@ -2,11 +2,12 @@ Summary:      A customized configuration of the fvwm2 window manager
 Summary(pl):   U¿yteczna konfiguracja zarz±dcy okien fvwm2
 Name:          AnotherLevel
 Version:       0.9
 Summary(pl):   U¿yteczna konfiguracja zarz±dcy okien fvwm2
 Name:          AnotherLevel
 Version:       0.9

-Release:       2
+Release:       3

 License:       distributable
 Group:         X11/Window Managers
 # Source0-md5: ddeb447d0bf8aeca5bb1cf30878b4d55
 Source0:       %{name}-%{version}.tar.gz
 License:       distributable
 Group:         X11/Window Managers
 # Source0-md5: ddeb447d0bf8aeca5bb1cf30878b4d55
 Source0:       %{name}-%{version}.tar.gz

+BuildRequires: sed >= 4.0

 Requires:      fvwm2
 Requires:      fvwm2-icons
 Requires:      m4
 Requires:      fvwm2
 Requires:      fvwm2-icons
 Requires:      m4


@@ -38,6 +39,9 @@ Grega J. Bradosa, kt
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

+# We need 'pixmaps/mini' path, do not need 'pixmaps/redhat' one
+sed -i 's/redhat/mini/' scripts/fvwm2rc.defines.m4
+

 %{__make} install \
        TOPDIR=$RPM_BUILD_ROOT \
        ICONDIR=%{_pixmapsdir} \
 %{__make} install \
        TOPDIR=$RPM_BUILD_ROOT \
        ICONDIR=%{_pixmapsdir} \


@@ -48,10 +52,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/TheNextLevel
 ln -sf ../AnotherLevel/fvwm2rc.m4 \
        $RPM_BUILD_ROOT%{_sysconfdir}/X11/TheNextLevel/.fvwm2rc.m4
 
 ln -sf ../AnotherLevel/fvwm2rc.m4 \
        $RPM_BUILD_ROOT%{_sysconfdir}/X11/TheNextLevel/.fvwm2rc.m4
 

-install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/Sessions
-install AnotherLevel.session \
-       $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/Sessions/AnotherLevel
-

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 


@@ -60,9 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc Sample.Xmodmap
 %dir %{_sysconfdir}/X11/AnotherLevel
 %config %{_sysconfdir}/X11/AnotherLevel/*
 %doc Sample.Xmodmap
 %dir %{_sysconfdir}/X11/AnotherLevel
 %config %{_sysconfdir}/X11/AnotherLevel/*

+%attr(755,root,root) %{_bindir}/*

 %{_sysconfdir}/X11/TheNextLevel
 %{_sysconfdir}/X11/TheNextLevel

-%attr(755,root,root) %{_sysconfdir}/X11/xdm/Sessions/AnotherLevel

 %{_pixmapsdir}/*.xpm
 %{_pixmapsdir}/mini/*.xpm
 %{_mandir}/man1/*
 %{_pixmapsdir}/*.xpm
 %{_pixmapsdir}/mini/*.xpm
 %{_mandir}/man1/*

-%attr(755,root,root) %{_bindir}/*