rpms/awstats/EL-5 awstats.spec,1.20,1.21
Tim Jackson (timj)
fedora-extras-commits at redhat.com
Sun Mar 16 10:36:31 UTC 2008
- Previous message (by thread): rpms/keepassx/devel .cvsignore, 1.5, 1.6 keepassx-0.3.0-gcc43.patch, 1.1, 1.2 keepassx.spec, 1.8, 1.9 sources, 1.5, 1.6 keepassx-0.3.0-xdg.patch, 1.1, NONE
- Next message (by thread): rpms/rapidsvn/devel rapidsvn-gcc43.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 rapidsvn.spec, 1.13, 1.14 sources, 1.5, 1.6 rapidsvn-wx28.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: timj
Update of /cvs/extras/rpms/awstats/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30573
Modified Files:
awstats.spec
Log Message:
Fix encoding of awstats_changelog.txt
Remove some stray upstream temp files
Fix EOL encoding of documentation to be consistent
Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/awstats.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- awstats.spec 16 Mar 2008 10:06:34 -0000 1.20
+++ awstats.spec 16 Mar 2008 10:35:47 -0000 1.21
@@ -116,6 +116,19 @@
perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
$RPM_BUILD_ROOT%{_datadir}/%{name}/tools/{*.pl,httpd_conf}
+# Remove some upstream version control files
+find $RPM_BUILD_ROOT%{_datadir} -name .cvsignore | xargs rm -f
+find docs/ -name .cvsignore | xargs rm -f
+
+# Fix encoding of changelog
+iconv -f iso-8859-1 -t utf-8 < docs/awstats_changelog.txt > docs/awstats_changelog.txt.utf8
+mv docs/awstats_changelog.txt.utf8 docs/awstats_changelog.txt
+
+# Fix EOLs
+%{__sed} -i 's/\r//' docs/pad_awstats.xml
+%{__sed} -i 's/\r//' docs/styles.css
+%{__sed} -i 's/\r//' docs/awstats_changelog.txt
+
# Apache configuration
install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
perl -pi -e 's|/usr/local|%{_datadir}|g;s|Allow from all|Allow from 127.0.0.1|g' \
@@ -209,6 +222,9 @@
- awstats does not actually require httpd (#406901)
- Fix cron script to be compatible with SELinux (#435101)
- Mark httpd config as noreplace
+- Fix encoding of awstats_changelog.txt
+- Remove some stray upstream temp files
+- Fix EOL encoding of documentation to be consistent
* Tue Sep 18 2007 Tim Jackson <rpm at timj.co.uk> 6.7-1
- initial import to EPEL-5, from Fedora
- Previous message (by thread): rpms/keepassx/devel .cvsignore, 1.5, 1.6 keepassx-0.3.0-gcc43.patch, 1.1, 1.2 keepassx.spec, 1.8, 1.9 sources, 1.5, 1.6 keepassx-0.3.0-xdg.patch, 1.1, NONE
- Next message (by thread): rpms/rapidsvn/devel rapidsvn-gcc43.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 rapidsvn.spec, 1.13, 1.14 sources, 1.5, 1.6 rapidsvn-wx28.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list