rpms/linkchecker/devel linkchecker.spec,1.5,1.6

[W. Michael Petullo (mikep)]

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31576

Modified Files:
	linkchecker.spec 
Log Message:
Fixed build on Rawhide.



Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linkchecker.spec	17 Feb 2006 21:00:17 -0000	1.5
+++ linkchecker.spec	29 Jul 2006 00:42:07 -0000	1.6
@@ -1,17 +1,15 @@
-%define pythonver 2.4
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary: Check HTML documents for broken links
 Name: linkchecker
 Version: 3.3
-Release: 3
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://dl.sf.net/linkchecker/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://linkchecker.sourceforge.net/
 BuildRequires: python-devel
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 # Do not have one of these to test on:
 ExcludeArch: x86_64
 
@@ -19,22 +17,39 @@
 Linkchecker is a simple script that checks HTML documents for broken links.
 
 %prep
-%setup
+%setup -q
+
+# Fix character encoding
+iconv -f iso-8859-1 -t utf-8 -o linkchecker-de.1 doc/de/linkchecker.1
+mv linkchecker-de.1 doc/de/linkchecker.1
+iconv -f iso-8859-1 -t utf-8 -o linkchecker-fr.1 doc/fr/linkchecker.1
+mv linkchecker-fr.1 doc/fr/linkchecker.1
+
+# Avoid docfile dependency
+sed -i -e 's:#!/usr/bin/env python.*:#!%{__python}:' doc/rest2htmlnav
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+CFLAGS="%{optflags}" %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
-# %find_lang %{name}
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
+
+# Collate list of python files
+(
+  echo '%defattr (0644,root,root,0755)'
+  find %{buildroot}%{python_sitelib}/linkcheck -type d |
+    sed 's:%{buildroot}\(.*\):%dir \1:'
+  find %{buildroot}%{python_sitelib}/linkcheck -not -type d -not -name '*.pyo' |
+    sed 's:%{buildroot}\(.*\):\1:'
+  find %{buildroot}%{python_sitelib}/linkcheck -not -type d -name '*.pyo' |
+    sed 's:%{buildroot}\(.*\):%ghost \1:'
+) > pyfiles
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-# %files -f %{name}.lang
-%files
-%defattr(-,root,root)
+%files -f pyfiles
 %{_bindir}/linkchecker
 %{python_sitelib}/*.py
 %dir %{python_sitelib}/linkcheck/
@@ -79,8 +94,16 @@
 %{_datadir}/linkchecker/*
 %{_mandir}/man1/*
 %doc TODO doc/ cgi/lconline/ test/ README LICENSE
+%dir %{_mandir}/de/man1
+%lang(de) %{_mandir}/de/man1/linkchecker.1*
+%dir %{_mandir}/fr/man1
+%lang(fr) %{_mandir}/fr/man1/linkchecker.1*
 
 %changelog
+* Fri Jul 28 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-4
+   - Apply patch from Paul Howarth that fixes build on Rawhide (BZ
+   200282).
+
 * Fri Feb 17 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-3
    - Rebuild for Fedora Extras 5.
 
@@ -97,11 +120,11 @@
    - ExcludeArch: x86_64.  I don't have one to test on.
 
 * Sun Oct 23 2005 W. Michael Petullo <mike[at]flyn.org> - 3.2-3
-   - %dir appropriate directories.
+   - %%dir appropriate directories.
 
 * Mon Sep 26 2005 W. Michael Petullo <mike[at]flyn.org> - 3.2-2
    - Include LICENSE.
-   - %ghost .pyo files.
+   - %%ghost .pyo files.
 
 * Sat Sep 17 2005 W. Michael Petullo <mike[at]flyn.org> - 3.2-1
    - No longer use record option to setup.py.