Cleanup and fix packaging. Submitted by: Matthias Kurz

linkchecker/linkchecker.patch

@@ -0,0 +1,58 @@
+Index: setup.py
+===================================================================
+RCS file: /cvs/opkg/vendor_stuff/linkchecker/setup.py,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 setup.py
+--- setup.py	7 Feb 2005 00:30:28 -0000	1.1.1.1
++++ setup.py	14 Feb 2005 07:18:20 -0000
+@@ -86,7 +86,7 @@
+             else:
+                 val = getattr(self, attr)
+             if attr == 'install_data':
+-                cdir = os.path.join(val, "share", "linkchecker")
++                cdir = os.path.join(val, "etc", "linkchecker")
+                 data.append('config_dir = %r' % cnormpath(cdir))
+             data.append("%s = %r" % (attr, cnormpath(val)))
+ 	self.distribution.create_conf_file(data, directory=self.install_lib)
+@@ -195,10 +195,10 @@
+     def build_extensions (self):
+         # For gcc 3.x we can add -std=gnu99 to get rid of warnings.
+         extra = []
+-        if self.compiler.compiler_type == 'unix':
+-            option = "-std=gnu99"
+-            if cc_supports_option(self.compiler.compiler, option):
+-                extra.append(option)
++        #if self.compiler.compiler_type == 'unix':
++            #option = "-std=gnu99"
++            #if cc_supports_option(self.compiler.compiler, option):
++                #extra.append(option)
+         # First, sanity-check the 'extensions' list
+         self.check_extensions_list(self.extensions)
+         for ext in self.extensions:
+@@ -248,7 +248,7 @@
+              ['share/locale/fr/LC_MESSAGES/linkchecker.mo']),
+          ('share/locale/nl/LC_MESSAGES',
+              ['share/locale/nl/LC_MESSAGES/linkchecker.mo']),
+-         ('share/linkchecker',
++         ('etc/linkchecker',
+              ['config/linkcheckerrc', 'config/logging.conf', ]),
+          ('share/linkchecker/examples',
+              ['cgi/lconline/leer.html.en', 'cgi/lconline/leer.html.de',
+@@ -258,13 +258,12 @@
+       ]
+ 
+ if os.name == 'posix':
+-    data_files.append(('share/man/man1', ['doc/en/linkchecker.1']))
+-    data_files.append(('share/man/de/man1', ['doc/de/linkchecker.1']))
+-    data_files.append(('share/man/fr/man1', ['doc/fr/linkchecker.1']))
++    data_files.append(('man/man1', ['doc/en/linkchecker.1']))
++    data_files.append(('man/de/man1', ['doc/de/linkchecker.1']))
++    data_files.append(('man/fr/man1', ['doc/fr/linkchecker.1']))
+     data_files.append(('share/linkchecker/examples',
+               ['config/linkchecker-completion', 'config/linkcheck-cron.sh']))
+-elif os.name == 'nt':
+-    data_files.append(('share/linkchecker/doc',
++    data_files.append(('share/linkchecker/html',
+              ['doc/documentation.html', 'doc/index.html',
+               'doc/install.html', 'doc/index.html', 'doc/other.html',
+               'doc/upgrading.html', 'doc/lc.css', 'doc/navigation.css',

linkchecker/linkchecker.spec

@@ -38,11 +38,12 @@ Class:        PLUS
 Group:        Misc
 License:      GPL
 Version:      %{V_linkchecker}
-Release:      20050209
+Release:      20050214
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/linkchecker/linkchecker-%{V_linkchecker}.tar.gz
 Source1:      http://osdn.dl.sourceforge.net/sourceforge/pydns/pydns-%{V_pydns}.tgz
+Patch0:       linkchecker.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -70,14 +71,9 @@ AutoReqProv:  no
 %prep
     %setup -q -c
     %setup -q -T -D -a 1
+    %patch -d linkchecker-%{V_linkchecker} -p0
 
 %build
-    ( cd linkchecker-%{V_linkchecker}
-      %{l_shtool} subst \
-          -e 's;share/linkchecker;etc/linkchecker;' \
-          -e 's;share/man;man;' \
-          `find . -type f -print`
-    ) || exit $?
 
 %install
     rm -rf $RPM_BUILD_ROOT
@@ -87,9 +83,11 @@ AutoReqProv:  no
     ( cd linkchecker-%{V_linkchecker}
       %{l_prefix}/bin/python setup.py install --root=$RPM_BUILD_ROOT
     ) || exit $?
-    rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/linkchecker/examples
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/{de,fr}
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std} \
+        '%config %{l_prefix}/etc/linkchecker/*'
 
 %files -f files