- switch $(ECHO) to echo in Makefile.am to avoid errors (sed)

- change %%doc section
- add one missing change to previous commit log

Changed files:
    ftgl.spec -> 1.16.2.2

diff --git a/ftgl.spec b/ftgl.spec
index 3dbba381b822d969445a4f9eb4ed6b44de0803d9..d5a97aa00553b477e99a6b0e74c26281229ac19e 100644 (file)
--- a/ftgl.spec
+++ b/ftgl.spec
@@ -21,6 +21,7 @@ BuildRequires:        freetype-devel >= 2.0.9
 BuildRequires: ghostscript
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
+BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,6 +76,7 @@ Statyczna biblioteka FTGL.
 %prep
 %setup -q -n %{name}-%{version}~%{_rc}
 #%%patch0 -p1
+%{__sed} -i 's/\$(ECHO)/echo/' Makefile.am
 
 %build
 %{__libtoolize}
@@ -102,12 +104,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc HISTORY.txt README.txt license.txt
+%doc AUTHORS ChangeLog COPYING NEWS README docs/{*.dox,*.txt}
 %attr(755,root,root) %{_libdir}/libftgl.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc unix/docs/html
+%doc docs/html
 %attr(755,root,root) %{_libdir}/libftgl.so
 %{_libdir}/libftgl.la
 %{_includedir}/FTGL