rpms/viewvc/F-11 viewvc-lexer-mimetypes.py, 1.1, 1.2 viewvc.spec, 1.21, 1.22

[bojan]

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25338

Modified Files:
	viewvc-lexer-mimetypes.py viewvc.spec 
Log Message:
Better mimetypes.conf generation script.


Index: viewvc-lexer-mimetypes.py
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc-lexer-mimetypes.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- viewvc-lexer-mimetypes.py	11 Aug 2009 03:26:33 -0000	1.1
+++ viewvc-lexer-mimetypes.py	13 Aug 2009 01:24:16 -0000	1.2
@@ -20,6 +20,18 @@ for fullname, names, exts, mimetype in g
             print exts[i][2:],
           if i == len(exts)-1:
             print
+  elif len(exts) == 1:
+    for i in range(len(mimetype)):
+      if re.match('\*\.',exts[0]):
+        if re.search('\[[0-9]+\]',exts[0]):
+          s=re.search('\[[0-9]+\]',exts[0]).span()[0]+1
+          e=re.search('\[[0-9]+\]',exts[0]).span()[1]-1
+          print mimetype[i],
+          for k in range(s,e):
+            print exts[0][2:s-1]+exts[0][k]+exts[0][e+1:],
+          print
+        else:
+          print mimetype[i], exts[0][2:]
   else:
     for i in range(len(mimetype)):
       if len(exts) > i:


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-11/viewvc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- viewvc.spec	12 Aug 2009 03:05:26 -0000	1.21
+++ viewvc.spec	13 Aug 2009 01:24:16 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -118,6 +118,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Thu Aug 13 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-3
+- better mimetypes.conf generation script
+
 * Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-2
 - fix replacement of various config variables