diff options
author | Florent Villard <warly@mandriva.com> | 2006-09-18 18:36:58 +0000 |
---|---|---|
committer | Florent Villard <warly@mandriva.com> | 2006-09-18 18:36:58 +0000 |
commit | a798f4ea402228a85968ad8a69500b319f9f7581 (patch) | |
tree | c33c49f8951e3bb80d927ffbe5523888556d8c99 /indexhtml.spec | |
parent | effe2337ba170867346d0cf0d172e63fb4e08fb2 (diff) | |
download | indexhtml-a798f4ea402228a85968ad8a69500b319f9f7581.tar indexhtml-a798f4ea402228a85968ad8a69500b319f9f7581.tar.gz indexhtml-a798f4ea402228a85968ad8a69500b319f9f7581.tar.bz2 indexhtml-a798f4ea402228a85968ad8a69500b319f9f7581.tar.xz indexhtml-a798f4ea402228a85968ad8a69500b319f9f7581.zip |
try to fix the install with excludedocs activated
Diffstat (limited to 'indexhtml.spec')
-rw-r--r-- | indexhtml.spec | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/indexhtml.spec b/indexhtml.spec index e82f900..bd83f08 100644 --- a/indexhtml.spec +++ b/indexhtml.spec @@ -1,6 +1,6 @@ %define name indexhtml %define version 2007.0 -%define release %mkrel 2 +%define release %mkrel 5 Summary: Mandriva Linux html welcome page Name: %{name} @@ -65,9 +65,9 @@ install -m 0644 HTML/index.html %buildroot/%_datadir/doc/HTML/index.html #ln -s ../../../../%_datadir/mdk/indexhtml/update-indexhtml indexhtml # add a default -cat %_datadir/mdk/indexhtml/index.html | \ +cat %buildroot/%_datadir/mdk/indexhtml/index.html | \ sed "s/#MDV_RELEASE/`cat /etc/release`/" | \ - sed "s/#MDV_PRODUCT/`gawk -F= '/META_CLASS/ { print $2 }' /etc/sysconfig/system`/" | \ + sed "s/#MDV_PRODUCT/download/" | \ sed "s/#MDV_PACK//" | \ sed "s/#LANG/en/g" \ > %buildroot/%_datadir/doc/HTML/index.html @@ -87,10 +87,20 @@ cat %_datadir/mdk/indexhtml/index.html | \ %files %defattr(-,root,root,-) %_datadir/mdk/ +%dir %_datadir/doc/HTML/ %_datadir/doc/HTML/index.html #/etc/sysconfig/network-scripts/ifup.d/indexhtml %changelog +* Mon Sep 18 2006 Warly <warly@mandriva.com> 2007.0-5mdv2007.0 +- must explicitely add /usr/share/doc/HTML as dir for excludedocs not to ignore it + +* Thu Sep 14 2006 Warly <warly@mandriva.com> 2007.0-4mdv2007.0 +- really fix the default index.html when build by build bot (without /etc/sysconfig/system) + +* Thu Sep 14 2006 Warly <warly@mandriva.com> 2007.0-3mdv2007.0 +- fix default index.html generation problem + * Thu Aug 31 2006 Warly <warly@mandriva.com> 2007.0-2mdv2007.0 - add a default index.html so that /usr/share/doc/HTML is created and in case of --noscripts install |