rpms/manedit/devel manedit-1.2.1-more-manpages.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 manedit.spec, 1.24, 1.25 sources, 1.7, 1.8 manedit-1.1.1-more-manpages.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/manedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6187/devel

Modified Files:
	.cvsignore manedit.spec sources 
Added Files:
	manedit-1.2.1-more-manpages.patch 
Removed Files:
	manedit-1.1.1-more-manpages.patch 
Log Message:
* Thu Oct 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.1-1
- 1.2.1


manedit-1.2.1-more-manpages.patch:

--- NEW FILE manedit-1.2.1-more-manpages.patch ---
--- manedit-1.2.1/manedit/editor.c.manpages	2008-10-12 08:00:00.000000000 +0900
+++ manedit-1.2.1/manedit/editor.c	2008-10-16 03:31:03.000000000 +0900
@@ -31,6 +31,8 @@
 #include "me_cfg_list.h"
 #include "config.h"
 
+#include "mansuffix.h"
+
 #include "images/icon_manedit_editor_48x48.xpm"
 #include "images/icon_manedit_editor_16x16.xpm"
 #include "images/icon_manedit_editor_20x20.xpm"
@@ -749,7 +751,7 @@
 	/* Create the file types list */
 	FileBrowserTypeListNew(
 	    &ftypes_list, &nftypes,
-	    ".1 .2 .3 .4 .5 .6 .7 .8 .9 .bz2 .gz",
+	    MANPAGE_SUFFIX,
 	    "Manual page"
 	);
 	FileBrowserTypeListNew(
@@ -907,7 +909,7 @@
 	/* Create the file types list */
 	FileBrowserTypeListNew(
 	    &ftypes_list, &nftypes,
-	    ".1 .2 .3 .4 .5 .6 .7 .8 .9 .bz2 .gz",
+	    MANPAGE_SUFFIX,
 	    "Manual page"
 	);
 	FileBrowserTypeListNew(
--- manedit-1.2.1/manedit/mansuffix.h.manpages	2008-10-16 03:25:25.000000000 +0900
+++ manedit-1.2.1/manedit/mansuffix.h	2008-10-16 03:27:41.000000000 +0900
@@ -0,0 +1,8 @@
+#ifndef		MANSUFFIX_H
+#define		MANSUFFIX_H
+
+#define  MANPAGE_SUFFIX \
+	".1 .2 .3 .4 .5 .6 .7 .8 .9 .bz2 .gz" \
+	" .1x .2x .3x .4x .5x .6x .7x .8x .9x"
+
+#endif
--- manedit-1.2.1/manedit/me_core.c.manpages	2008-10-12 08:00:00.000000000 +0900
+++ manedit-1.2.1/manedit/me_core.c	2008-10-16 03:37:00.000000000 +0900
@@ -112,6 +112,10 @@
 	string_list = CFGStringListNew(NULL);
 	string_list->list = g_list_append(
 	    string_list->list,
+	    g_strdup("/usr/kerberos/man")
+	);
+	string_list->list = g_list_append(
+	    string_list->list,
 	    g_strdup("/usr/man")
 	);
 	string_list->list = g_list_append(
--- manedit-1.2.1/manedit/viewer_cb.c.manpages	2008-10-12 08:00:00.000000000 +0900
+++ manedit-1.2.1/manedit/viewer_cb.c	2008-10-16 03:30:27.000000000 +0900
@@ -26,6 +26,8 @@
 #include "me_cfg_list.h"
 #include "config.h"
 
+#include "mansuffix.h"
+
 
 gint ViewerDeleteEventCB(GtkWidget *widget, GdkEvent *event, gpointer data);
 void ViewerCloseCB(GtkWidget *widget, gpointer data);
@@ -637,7 +639,7 @@
 	    /* Query the user to open a manual page */
 	    FileBrowserTypeListNew(
 		&ftypes_list, &nftypes,
-		".1 .2 .3 .4 .5 .6 .7 .8 .9 .bz2 .gz",
+		MANPAGE_SUFFIX,
 		"Manual page"
 	    );
 	    FileBrowserTypeListNew(


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Jun 2008 12:04:45 -0000	1.7
+++ .cvsignore	15 Oct 2008 18:57:39 -0000	1.8
@@ -1 +1 @@
-manedit-1.1.1.tar.bz2
+manedit-1.2.1.tar.bz2


Index: manedit.spec
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/manedit.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- manedit.spec	29 Aug 2008 01:58:52 -0000	1.24
+++ manedit.spec	15 Oct 2008 18:57:40 -0000	1.25
@@ -1,9 +1,9 @@
 %define         repoid           6183
-
+%define		_default_patch_fuzz	2
 
 Name:           manedit
-Version:        1.1.1
-Release:        3%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        UNIX Manual Page Editor
 
 Group:          Development/Tools
@@ -15,7 +15,7 @@
 Source1:        manedit.desktop
 Source2:        manview.desktop
 Patch0:         manedit-0.7.1-makefile.patch
-Patch1:         manedit-1.1.1-more-manpages.patch
+Patch1:         manedit-1.2.1-more-manpages.patch
 Patch4:		manedit-1.1.1-fix-compilation.patch
 Patch5:		manedit-1.1.1-fix-segv-on-manview.patch
 Patch6:		manedit-1.1.1-tmpdir.patch
@@ -117,6 +117,9 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Oct 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.1-1
+- 1.2.1
+
 * Fri Aug 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.1-3
 - Use gcc instead of %%__cc
   (On F-10+ %%__cc is expanded as "gcc -std=c99" and using glib headers


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Jun 2008 12:04:45 -0000	1.7
+++ sources	15 Oct 2008 18:57:40 -0000	1.8
@@ -1 +1 @@
-8fcc4675b31d2d6828081243320b1a89  manedit-1.1.1.tar.bz2
+a7ee1835e32ed3c9279412af7caf13ef  manedit-1.2.1.tar.bz2


--- manedit-1.1.1-more-manpages.patch DELETED ---