Silence latest rpmlint about non-UTF-8 htmls + no longer release in dir
name(only name+version #389231
This commit is contained in:
parent
4dad04b118
commit
2bc3e3ee6d
@ -1,6 +1,6 @@
|
|||||||
Name: docbook-style-xsl
|
Name: docbook-style-xsl
|
||||||
Version: 1.73.2
|
Version: 1.73.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Group: Applications/Text
|
Group: Applications/Text
|
||||||
|
|
||||||
Summary: Norman Walsh's XSL stylesheets for DocBook XML
|
Summary: Norman Walsh's XSL stylesheets for DocBook XML
|
||||||
@ -44,6 +44,15 @@ popd
|
|||||||
%patch2 -p1 -b .marginleft
|
%patch2 -p1 -b .marginleft
|
||||||
%patch3 -p1 -b .newmethods
|
%patch3 -p1 -b .newmethods
|
||||||
cp -p %{SOURCE1} Makefile
|
cp -p %{SOURCE1} Makefile
|
||||||
|
|
||||||
|
# fix of non UTF-8 files rpmlint warnings
|
||||||
|
for fhtml in $(find ./doc -name '*.html' -type f)
|
||||||
|
do
|
||||||
|
iconv -f ISO-8859-1 -t UTF-8 "$fhtml" -o "$fhtml".tmp
|
||||||
|
mv -f "$fhtml".tmp "$fhtml"
|
||||||
|
sed -i 's/charset=ISO-8859-1/charset=UTF-8/' "$fhtml"
|
||||||
|
done
|
||||||
|
|
||||||
for f in $(find -name "*'*")
|
for f in $(find -name "*'*")
|
||||||
do
|
do
|
||||||
mv -v "$f" $(echo "$f" | tr -d "'")
|
mv -v "$f" $(echo "$f" | tr -d "'")
|
||||||
@ -56,8 +65,8 @@ done
|
|||||||
%install
|
%install
|
||||||
DESTDIR=$RPM_BUILD_ROOT
|
DESTDIR=$RPM_BUILD_ROOT
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
make install BINDIR=$DESTDIR%{_bindir} DESTDIR=$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}
|
make install BINDIR=$DESTDIR%{_bindir} DESTDIR=$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}
|
||||||
ln -s xsl-stylesheets-%{version}-%{release} \
|
ln -s xsl-stylesheets-%{version} \
|
||||||
$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets
|
$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets
|
||||||
|
|
||||||
# Don't ship the extensions (bug #177256).
|
# Don't ship the extensions (bug #177256).
|
||||||
@ -74,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc README
|
%doc README
|
||||||
%doc TODO
|
%doc TODO
|
||||||
%doc doc
|
%doc doc
|
||||||
%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}
|
%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}
|
||||||
%{_datadir}/sgml/docbook/xsl-stylesheets
|
%{_datadir}/sgml/docbook/xsl-stylesheets
|
||||||
|
|
||||||
|
|
||||||
@ -82,25 +91,30 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
CATALOG=%{_sysconfdir}/xml/catalog
|
CATALOG=%{_sysconfdir}/xml/catalog
|
||||||
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
|
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
|
||||||
"http://docbook.sourceforge.net/release/xsl/%{version}" \
|
"http://docbook.sourceforge.net/release/xsl/%{version}" \
|
||||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
|
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||||
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
|
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
|
||||||
"http://docbook.sourceforge.net/release/xsl/%{version}" \
|
"http://docbook.sourceforge.net/release/xsl/%{version}" \
|
||||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
|
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||||
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
|
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
|
||||||
"http://docbook.sourceforge.net/release/xsl/current" \
|
"http://docbook.sourceforge.net/release/xsl/current" \
|
||||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
|
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||||
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
|
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
|
||||||
"http://docbook.sourceforge.net/release/xsl/current" \
|
"http://docbook.sourceforge.net/release/xsl/current" \
|
||||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
|
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||||
|
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
CATALOG=%{_sysconfdir}/xml/catalog
|
CATALOG=%{_sysconfdir}/xml/catalog
|
||||||
%{_bindir}/xmlcatalog --noout --del \
|
%{_bindir}/xmlcatalog --noout --del \
|
||||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
|
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 27 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-5
|
||||||
|
- convert all html files in doc to UTF-8 in prep
|
||||||
|
(latest rpmlint gives warnings)
|
||||||
|
- no longer using release in style-xsl dir(#389231)
|
||||||
|
|
||||||
* Tue Nov 06 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-4
|
* Tue Nov 06 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-4
|
||||||
- Merge review(#225704)
|
- Merge review(#225704)
|
||||||
- spec file modified to follow guidelines
|
- spec file modified to follow guidelines
|
||||||
|
Loading…
Reference in New Issue
Block a user