diff options
| author | David Baudens <baudens@mandriva.com> | 2004-02-17 11:12:18 +0000 |
|---|---|---|
| committer | David Baudens <baudens@mandriva.com> | 2004-02-17 11:12:18 +0000 |
| commit | 27338585016281c3c979806e2cf1dc104de730fd (patch) | |
| tree | 5c61a3d0d6fe00cf83ef1dd7ea8e5189246268da | |
| parent | 85d386867b64b5fa761b532df977989dd5530f9e (diff) | |
| download | indexhtml-27338585016281c3c979806e2cf1dc104de730fd.tar indexhtml-27338585016281c3c979806e2cf1dc104de730fd.tar.gz indexhtml-27338585016281c3c979806e2cf1dc104de730fd.tar.bz2 indexhtml-27338585016281c3c979806e2cf1dc104de730fd.tar.xz indexhtml-27338585016281c3c979806e2cf1dc104de730fd.zip | |
Update
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | indexhtml.spec | 30 |
2 files changed, 15 insertions, 19 deletions
@@ -33,8 +33,8 @@ localcopy: clean find $(PACKAGE)-$(VERSION) -type d -name CVS|xargs rm -rf tar: - tar cvf $(PACKAGE)-$(VERSION).tar $(PACKAGE)-$(VERSION) - bzip2 -9vf $(PACKAGE)-$(VERSION).tar + tar cf $(PACKAGE)-$(VERSION).tar $(PACKAGE)-$(VERSION) + bzip2 -9f $(PACKAGE)-$(VERSION).tar rm -rf $(PACKAGE)-$(VERSION) buildrpm: diff --git a/indexhtml.spec b/indexhtml.spec index 273b0c2..217bd00 100644 --- a/indexhtml.spec +++ b/indexhtml.spec @@ -1,7 +1,7 @@ Summary: Mandrake html welcome page Name: indexhtml Version: 10.0 -Release: 3mdk +Release: 4mdk Source: indexhtml-%version.tar.bz2 Group: System/Base License: GPL @@ -30,7 +30,9 @@ install -d -m 0755 %buildroot/%_datadir/mdk/indexhtml/ install -m 0644 HTML/* %buildroot/%_datadir/mdk/indexhtml/ install -d -m 0755 %buildroot/%_datadir/mdk/mail/ -install -m 0644 mail/* %buildroot/%_datadir/mdk/mail/ +for i in $(find mail/ -type f); do + install -m 0644 $i %buildroot/%_datadir/mdk/mail/ +done install -d -m 0755 %buildroot/%_datadir/doc/HTML/ install -m 0644 HTML/index-en.html %buildroot/%_datadir/doc/HTML/index.html @@ -59,16 +61,12 @@ fi for i in $LISTLANG do if [ -r %_datadir/mdk/indexhtml/index-$i.html ]; then - cat %_datadir/mdk/indexhtml/index-$i.html | \ - sed 's:="\([^/][^"]*.css\)">:="%_datadir/mdk/indexhtml/\1">:' > \ - %_datadir/doc/HTML/index.html + cat %_datadir/mdk/indexhtml/index-$i.html > %_datadir/doc/HTML/index.html break else lang=`echo $i | cut -b-2` if [ -r %_datadir/mdk/indexhtml/index-$lang.html ]; then - cat %_datadir/mdk/indexhtml/index-$lang.html | \ - sed 's:="\([^/][^"]*.css\)">:="%_datadir/mdk/indexhtml/\1">:' > \ - %_datadir/doc/HTML/index.html + cat %_datadir/mdk/indexhtml/index-$lang.html > %_datadir/doc/HTML/index.html break; fi @@ -76,29 +74,27 @@ do done if [ ! -r %_datadir/doc/HTML/index.html ]; then - cat %_datadir/mdk/indexhtml/index-en.html | \ - sed 's:="\([^/][^"]*.css\)">:="%_datadir/mdk/indexhtml/\1">:' > \ - %_datadir/doc/HTML/index.html + cat %_datadir/mdk/indexhtml/index-en.html > %_datadir/doc/HTML/index.html fi -%preun -rm -f %_datadir/doc/HTML/index.html - - %files %defattr(-,root,root,-) %dir %_datadir/mdk/ %dir %_datadir/mdk/indexhtml/ %_datadir/mdk/indexhtml/* - +# %dir %_datadir/mdk/mail/ %_datadir/mdk/mail/* +# +%_datadir/doc/HTML/index.html -%verify (not md5 mtime size) %_datadir/doc/HTML/index.html %changelog +* Tue Feb 17 2004 David Baudens <baudens@mandrakesoft.com> 10.0-4mdk +- Fix update + * Mon Feb 16 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-3mdk - Install first mail |