rpms/manedit/FC-5 manedit-0.8.1-allow-more_section.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 manedit.spec, 1.13, 1.14 sources, 1.4, 1.5 manedit-0.7.1-allow-more_section.patch, 1.1, NONE manedit-0.7.1-remove-some-warning.patch, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/manedit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31619

Modified Files:
	.cvsignore manedit.spec sources 
Added Files:
	manedit-0.8.1-allow-more_section.patch 
Removed Files:
	manedit-0.7.1-allow-more_section.patch 
	manedit-0.7.1-remove-some-warning.patch 
Log Message:
* Sun Feb 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-1
- 0.8.1


manedit-0.8.1-allow-more_section.patch:

--- NEW FILE manedit-0.8.1-allow-more_section.patch ---
--- manedit-0.8.1/manedit/editorcb.c.section	2007-02-10 20:24:48.000000000 +0900
+++ manedit-0.8.1/manedit/editorcb.c	2007-02-11 22:54:17.000000000 +0900
@@ -22,6 +22,12 @@
 #include "manedit.h"
 #include "config.h"
 
+#include <stdlib.h>
+#include <stdio.h>
+
+static char *suffix = NULL;
+
+static void init_suffix();
 
 void EditorItemDestroyCB(gpointer data);
 
@@ -148,6 +154,26 @@
 static editor_struct *editor_processing_undo = NULL;
 
 
+void init_suffix(){
+  char *suf = strdup("");
+  char *tmp;
+  char *_suf []= { "", "x", ".gz", ".bz2", NULL };
+  int i, j;
+
+  if (suffix) return;
+
+  for (j = 0; _suf[j]; j++){
+    for (i = 1; i <= 9; i++){
+      tmp = strdup(suf);
+      free(suf);
+      suf = (char *) malloc (strlen(tmp) + 10);
+      sprintf(suf, "%s .%i%s", tmp, i, _suf[j]);
+      free(tmp);
+    }
+  }
+  suffix = suf;
+}
+
 /*
  *	Destroys a branch's editor_item_struct.
  */
@@ -455,9 +481,10 @@
 			gint nftypes = 0, path_total_rtns;
 			fb_type_struct **ftypes_list = NULL, *ftype_rtn = NULL;
 
+			init_suffix();
 			FileBrowserTypeListNew(
 			    &ftypes_list, &nftypes,
-			    ".1 .2 .3 .4 .5 .6 .bz2 .gz",
+			    suffix,
 			    "Manual page"
 			);
 			FileBrowserTypeListNew(
@@ -739,9 +766,10 @@
 	    gint nftypes = 0, path_total_rtns;
 	    fb_type_struct **ftypes_list = NULL, *type_rtn;
 
+	    init_suffix();
 	    FileBrowserTypeListNew(
 		&ftypes_list, &nftypes,
-                ".1 .2 .3 .4 .5 .6 .bz2 .gz",
+                suffix,
                 "Manual page"
             );
             FileBrowserTypeListNew(
@@ -1250,9 +1278,10 @@
 	    fb_type_struct **ftypes_list = NULL, *type_rtn;
 
 	    /* Query the user to save the manual page */
+	    init_suffix();
             FileBrowserTypeListNew(
                 &ftypes_list, &nftypes,
-                ".1 .2 .3 .4 .5 .6 .bz2 .gz",
+                suffix,
                 "Manual page"
 	    );
 	    FileBrowserTypeListNew(
@@ -1678,7 +1707,7 @@
 
 		    FileBrowserTypeListNew(
 			&ftypes_list, &nftypes,
-                        ".1 .2 .3 .4 .5 .6 .bz2 .gz",
+                        suffix,
                         "Manual page"
                     );
                     FileBrowserTypeListNew(


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Nov 2006 09:10:27 -0000	1.4
+++ .cvsignore	11 Feb 2007 14:09:50 -0000	1.5
@@ -1 +1 @@
-manedit-0.7.1.tar.bz2
+manedit-0.8.1.tar.bz2


Index: manedit.spec
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/manedit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- manedit.spec	13 Nov 2006 09:10:27 -0000	1.13
+++ manedit.spec	11 Feb 2007 14:09:50 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           manedit
-Version:        0.7.1
-Release:        5%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        UNIX Manual Page Editor
 
 Group:          Development/Tools
@@ -10,9 +10,8 @@
 Source1:        manedit.desktop
 Source2:        manview.desktop
 Patch0:         manedit-0.7.1-makefile.patch
-Patch1:         manedit-0.7.1-allow-more_section.patch
+Patch1:         manedit-0.8.1-allow-more_section.patch
 Patch2:         manedit-0.7.1-manbase.patch
-Patch3:         manedit-0.7.1-remove-some-warning.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # This is gtk+ package
@@ -38,7 +37,6 @@
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .section
 %patch2 -p1 -b .manbase
-%patch3 -p1 -b .warn
 
 %build
 # I cannot understand this configure!!
@@ -61,14 +59,6 @@
 # remove manwrap
 %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/manwrap
 
-# install desktop file
-# Note: Category "Application" is now regarded as
-# redundant
-#
-# Original desktop-file-utils 0.11 no longer accepts 
-# "Application" "X-Fedora" categories and "X-Fedora"
-# should not be used any longer.
-#
 desktop-file-install \
    --vendor fedora \
    --remove-category Application \
@@ -118,6 +108,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Feb 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-1
+- 0.8.1
+
 * Sat Nov 11 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.1-5
 - Remove some warnings.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Nov 2006 09:10:27 -0000	1.4
+++ sources	11 Feb 2007 14:09:50 -0000	1.5
@@ -1 +1 @@
-229586101245eb61018ff031c2efb247  manedit-0.7.1.tar.bz2
+a3124ad8e5234c54c1493a821501c64d  manedit-0.8.1.tar.bz2


--- manedit-0.7.1-allow-more_section.patch DELETED ---


--- manedit-0.7.1-remove-some-warning.patch DELETED ---