rpms/viewvc/devel viewvc-lexer-mimetypes.py, 1.2, 1.3 viewvc.spec, 1.23, 1.24

[bojan]

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23608

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


Index: viewvc-lexer-mimetypes.py
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc-lexer-mimetypes.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- viewvc-lexer-mimetypes.py	13 Aug 2009 01:20:37 -0000	1.2
+++ viewvc-lexer-mimetypes.py	13 Aug 2009 04:00:56 -0000	1.3
@@ -7,10 +7,12 @@ from pygments.lexers import get_all_lexe
 for fullname, names, exts, mimetype in get_all_lexers():
   if len(exts) > len(mimetype):
     for j in range(len(mimetype)):
+      line=0
       for i in range(len(exts)):
         if re.match('\*\.',exts[i]):
           if i == 0:
             print mimetype[j],
+            line=1
           if re.search('\[[0-9]+\]',exts[i]):
             s=re.search('\[[0-9]+\]',exts[i]).span()[0]+1
             e=re.search('\[[0-9]+\]',exts[i]).span()[1]-1
@@ -18,8 +20,8 @@ for fullname, names, exts, mimetype in g
               print exts[i][2:s-1]+exts[i][k]+exts[i][e+1:],
           else:
             print exts[i][2:],
-          if i == len(exts)-1:
-            print
+        if line==1 and i == len(exts)-1:
+          print
   elif len(exts) == 1:
     for i in range(len(mimetype)):
       if re.match('\*\.',exts[0]):


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- viewvc.spec	13 Aug 2009 01:20:37 -0000	1.23
+++ viewvc.spec	13 Aug 2009 04:00:56 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.2
-Release:        3%{?dist}
+Release:        4%{?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-4
+- try one more time
+
 * Thu Aug 13 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-3
 - better mimetypes.conf generation script