rpms/manedit/FC-5 manedit-0.7.1-allow-more_section.patch, NONE, 1.1 manedit-0.7.1-makefile.patch, NONE, 1.1 manedit-0.7.1-manbase.patch, NONE, 1.1 manedit-0.7.1-remove-some-warning.patch, NONE, 1.1 manview.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 manedit.desktop, 1.1, 1.2 manedit.spec, 1.12, 1.13 sources, 1.3, 1.4 manedit-0.5.11-bzip2.patch, 1.1, NONE manedit-0.5.11-gcc4.patch, 1.1, NONE manedit-0.5.11-multilib.patch, 1.1, NONE manedit-0.5.11-nostrip.patch, 1.1, NONE

Mamoru Tasaka (mtasaka) fedora-extras-commits at redhat.com
Mon Nov 13 09:10:58 UTC 2006 

Author: mtasaka

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

Modified Files:
	.cvsignore manedit.desktop manedit.spec sources 
Added Files:
	manedit-0.7.1-allow-more_section.patch 
	manedit-0.7.1-makefile.patch manedit-0.7.1-manbase.patch 
	manedit-0.7.1-remove-some-warning.patch manview.desktop 
Removed Files:
	manedit-0.5.11-bzip2.patch manedit-0.5.11-gcc4.patch 
	manedit-0.5.11-multilib.patch manedit-0.5.11-nostrip.patch 
Log Message:
* Sat Nov 11 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.1-5
- Remove some warnings.


manedit-0.7.1-allow-more_section.patch:

--- NEW FILE manedit-0.7.1-allow-more_section.patch ---
--- manedit-0.7.1/manedit/main.c.section	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/main.c	2006-10-28 15:21:31.000000000 +0900
@@ -553,7 +553,9 @@
 
 	    FileBrowserTypeListNew(
 		list, total,
-		".1 .2 .3 .4 .5 .6 .bz2 .gz",
+		".1 .2 .3 .4 .5 .6 .7 .8 "
+		".1x .2x .3x .4x .5x .6x .7x .8x "
+		".bz2 .gz",
 		"Manual page"
 	    );
 	    FileBrowserTypeListNew(

manedit-0.7.1-makefile.patch:

--- NEW FILE manedit-0.7.1-makefile.patch ---
--- manedit-0.7.1/manedit/Makefile.install.FreeBSD.fedora	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/Makefile.install.FreeBSD	2006-10-30 16:52:26.000000000 +0900
@@ -11,7 +11,7 @@
 #	PREFIX
 #
 
-INSTALL      = install -o root -g wheel
+INSTALL      = install -c -p
 INSTBINFLAGS = -m 0755
 INSTMANFLAGS = -m 0444
 INSTDATFLAGS = -m 0644
@@ -22,14 +22,14 @@
 MKDIR      = mkdir
 MKDIRFLAGS = -p
 
-MAN          = $(BIN).1.bz2
+MAN          = $(BIN).1
 ICON         = $(BIN).xpm
 MANVIEW_ICON = manview.xpm
 
 BIN_DIR   = $(PREFIX)/bin
-ICONS_DIR = $(PREFIX)/share/$(BIN)/icons
+ICONS_DIR = $(PREFIX)/share/pixmaps
 DATA_DIR  = $(PREFIX)/share/$(BIN)
-MAN_DIR   = $(PREFIX)/man/man1
+MAN_DIR   = $(PREFIX)/share/man/man1
 
 install:
 	$(INSTALL) -d $(INSTBINFLAGS) $(BIN_DIR)
--- manedit-0.7.1/manedit/Makefile.fedora	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/Makefile	2006-10-30 16:46:52.000000000 +0900
@@ -19,8 +19,9 @@
 #   absolutly sure that requires modification.
 #
 PREFIX ?= /usr
-LOCALBASE ?= /usr/local
-X11BASE ?= /usr/X11R6
+LOCALBASE ?= /usr/local/share
+X11BASE ?= /usr/share
+MANBASE ?= /usr/share
 
 
 # ########################################################################
@@ -54,10 +55,9 @@
 GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
 CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
           -DPREFIX=\"$(PREFIX)\" \
-          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
-
-CPPFLAGS = -D__cplusplus -Dc_plusplus
+          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" -DMANBASE=\"$(MANBASE)\"
 
+CPPFLAGS = 
 
 # ########################################################################
 # Dependant Libraries:
@@ -91,6 +91,10 @@
 #
 INC =
 
+####################################################################
+
+CFLAGS += $(OPTFLAGS)
+LIB += $(LDFLAGS)
 
 # ########################################################################
 # Program Source and Header Files:
@@ -116,7 +120,7 @@
 # Build Rules:
 #
 $(BIN): $(OBJ_C) $(OBJ_CPP)
-	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
+	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
 
 all: $(BIN) $(BIN).1.out
 
@@ -138,8 +142,8 @@
 # Manual Page Build/Subs Rule:
 #
 $(BIN).1.out: $(BIN).1
-	$(SED) 's|%%PREFIX%%|$(PREFIX)|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
+	$(SED)  -e 's|%%PREFIX%%|$(PREFIX)|g'  \
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		-e 's|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
 
 # ########################################################################

manedit-0.7.1-manbase.patch:

--- NEW FILE manedit-0.7.1-manbase.patch ---
--- manedit-0.7.1/manedit/pref.c.manbase	2006-08-26 05:00:00.000000000 +0200
+++ manedit-0.7.1/manedit/pref.c	2006-10-31 10:25:44.000000000 +0100
@@ -1708,24 +1708,16 @@
 #if defined(__FreeBSD__)
 	    text[0] = "/usr/share/man";
 #else
-	    text[0] = "/usr/man";
+	    text[0] = MANBASE"/man";
 #endif
 	    text[1] = "Global";
 	    gtk_clist_append(GTK_CLIST(w), text);
 
-#if defined(__FreeBSD__)
 	    text[0] = LOCALBASE "/man";
-#else
-	    text[0] = "/usr/local/man";
-#endif
 	    text[1] = "Local";
 	    gtk_clist_append(GTK_CLIST(w), text);
 
-#if defined(__FreeBSD__)
 	    text[0] = X11BASE"/man";
-#else
-	    text[0] = "/usr/X11R6/man";
-#endif
 	    text[1] = "X Window Systems";
 	    gtk_clist_append(GTK_CLIST(w), text);
 	}

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

--- NEW FILE manedit-0.7.1-remove-some-warning.patch ---
--- manedit-0.7.1/manedit/clipboard.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/clipboard.c	2006-11-12 02:17:31.000000000 +0900
@@ -2166,7 +2166,7 @@
 		);
 		if(tmp_text != NULL)
 		{
-		    strncpy(tmp_text, cb->data, cb->data_length);
+		    strncpy(tmp_text, (gchar *)cb->data, cb->data_length);
 		    tmp_text[cb->data_length] = '\0';
 
 		    w = gtk_label_new(tmp_text);
--- manedit-0.7.1/manedit/editor.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editor.c	2006-11-12 02:20:09.000000000 +0900
@@ -69,6 +69,7 @@
 #include "images/icon_replace_20x20.xpm"
 #include "images/icon_replace_all_20x20.xpm"
 
+#include <string.h>
 
 editor_item_struct *EditorItemNew(
 	editor_item_type type,
--- manedit-0.7.1/manedit/editorcb.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editorcb.c	2006-11-12 02:17:31.000000000 +0900
@@ -2856,7 +2856,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,		/* Foreground color */
 			NULL,		/* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2885,7 +2885,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2962,7 +2962,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2992,7 +2992,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
--- manedit-0.7.1/manedit/editordnd.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editordnd.c	2006-11-12 02:17:31.000000000 +0900
@@ -965,7 +965,7 @@
 	    selection_data,
 	    GDK_SELECTION_TYPE_STRING,
 	    8,			/* 8 bits per character */
-	    buf, strlen(buf)
+	    (guchar *)buf, strlen(buf)
 	);
 	data_sent = TRUE;
 
@@ -981,7 +981,7 @@
 		selection_data,
 		GDK_SELECTION_TYPE_STRING,
 		8,      /* 8 bits per character */
-		s, strlen(s)
+		(guchar *)s, strlen(s)
 	    );
 	    data_sent = TRUE;
 	}
@@ -1367,7 +1367,7 @@
 	    )
 	    {
 		gchar *path = EditorDNDParseURL(
-		    selection_data->data, selection_data->length
+		    (gchar *)selection_data->data, selection_data->length
 		);
 		EditorFileLoad(editor, path, editor->selected_branch, FALSE);
 		g_free(path);
--- manedit-0.7.1/manedit/editorop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editorop.c	2006-11-12 02:26:43.000000000 +0900
@@ -4,6 +4,8 @@
 #include <gtk/gtk.h>
 #include <unistd.h>		/* For unlink() */
 
+#include <stdio.h>
+
 #include "../include/string.h"
 #include "../include/strexp.h"
 #include "../include/disk.h"
@@ -1143,7 +1145,10 @@
 	tmp_path = g_strdup(PrefixPaths(
 	    prog_tmp_path, "previewXXXXXX"
 	));
-	mkstemp(tmp_path);
+	if ((mkstemp(tmp_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", tmp_path);
+	  exit (1);
+	}
 
 	/* Here we play a trick, first record the full path name
 	 * on the item data and replace it with our tempory file path
--- manedit-0.7.1/manedit/fb.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/fb.c	2006-11-12 02:17:31.000000000 +0900
@@ -1458,7 +1458,7 @@
 			selection_data,
 			GDK_SELECTION_TYPE_STRING,
 			8,	/* 8 bits per character */
-			buf, buf_len
+			(guchar *)buf, buf_len
 		    );
 		    data_sent = TRUE;
 		    g_free(buf);
@@ -1475,7 +1475,7 @@
 		selection_data,
 		GDK_SELECTION_TYPE_STRING,
 		8,		/* 8 bits per character */
-		s,
+		(guchar *)s,
 		STRLEN(s) + 1	/* Include the '\0' character */
 	    );
 	    data_sent = TRUE;
--- manedit-0.7.1/manedit/guiutils.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/guiutils.c	2006-11-12 02:17:31.000000000 +0900
@@ -979,7 +979,7 @@
 		    g_free(name);
 		}
 	    }
-	    sel_rtn->data = s;
+	    sel_rtn->data = (guchar *)s;
 	    sel_rtn->length = STRLEN(s);
 
 	    /* Change the return type to string */
@@ -1024,7 +1024,7 @@
 	    gchar *s = (gchar *)g_malloc(len + 1);
 	    memcpy(s, selection_data->data, len);
 	    s[len] = '\0';
-	    sel_rtn->data = s;
+	    sel_rtn->data = (guchar *)s;
 	}
 }
 
@@ -3256,7 +3256,7 @@
 
 	/* Create bitmap */
 	bitmap = gdk_bitmap_create_from_data(
-	    window, xbm_data,
+	    window, (gchar *)xbm_data,
 	    width, height
 	);
 	g_free(xbm_data);	/* No longer needed */
--- manedit-0.7.1/manedit/main.c.warn	2006-11-12 02:17:31.000000000 +0900
+++ manedit-0.7.1/manedit/main.c	2006-11-12 02:21:38.000000000 +0900
@@ -3,6 +3,9 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "../include/disk.h"
 #include "../include/string.h"
 
--- manedit-0.7.1/manedit/maneditop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/maneditop.c	2006-11-12 02:29:24.000000000 +0900
@@ -4,6 +4,8 @@
 #include <gtk/gtk.h>
 #include <unistd.h>
 
+#include <stdio.h>
+
 #include "../include/disk.h"
 #include "../include/fio.h"
 #include "../include/string.h"
@@ -563,7 +565,11 @@
 		    item->full_path = STRDUP(PrefixPaths(
 			prog_tmp_path, "emergencyXXXXXX"
 		    ));
-		    mkstemp(item->full_path);
+		    if ((mkstemp(item->full_path)) == -1){
+		      fprintf(stderr, "Could not open %s\n",
+			      item->full_path);
+		      exit (1);
+		    }
 
 		    /* Save this branch */
 		    EditorFileSave(editor, branch);
--- manedit-0.7.1/manedit/mpfio.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/mpfio.c	2006-11-12 02:35:51.000000000 +0900
@@ -9,6 +9,8 @@
 #include <bzlib.h>
 #endif
 
+#include <stdio.h>
+
 #include "../include/fio.h"
 #include "../include/disk.h"
 #include "../include/string.h"
@@ -286,7 +288,10 @@
 		return(NULL);
 	    }
 
-	    fread(buf, sizeof(char), buf_len, fp);
+	    if (!(fread(buf, sizeof(char), buf_len, fp))){
+	      fprintf(stderr, "fread failed\n");
+	      exit (1);
+	    }
 	    buf[buf_len] = '\0';
 
 	    FClose(fp);
@@ -462,7 +467,10 @@
             if(fp == NULL)
                 return;
 
-	    fwrite(buf, sizeof(char), buf_len, fp);
+	    if (!(fwrite(buf, sizeof(char), buf_len, fp))){
+	      fprintf(stderr, "fwrite failed\n");
+	      exit (1);
+	    }
 
             FClose(fp);
         }
--- manedit-0.7.1/manedit/prefop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/prefop.c	2006-11-12 02:56:13.000000000 +0900
@@ -75,6 +75,7 @@
 							\
  colormap = gdk_window_get_colormap(w->window);		\
 							\
+ gdk_color.pixel = 0;	\
  gdk_color.red = (guint16)(color_ptr->r * 65535.0);	\
  gdk_color.green = (guint16)(color_ptr->g * 65535.0);	\
  gdk_color.blue = (guint16)(color_ptr->b * 65535.0);	\
@@ -93,6 +94,7 @@
 							\
  colormap = gdk_window_get_colormap(w->window);		\
 							\
+ gdk_color.pixel = 0;	\
  gdk_color.red = (guint16)(color_ptr->r * 65535.0);	\
  gdk_color.green = (guint16)(color_ptr->g * 65535.0);	\
  gdk_color.blue = (guint16)(color_ptr->b * 65535.0);	\
--- manedit-0.7.1/manedit/viewerdnd.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/viewerdnd.c	2006-11-12 02:17:31.000000000 +0900
@@ -199,7 +199,7 @@
 	    selection_data,
 	    GDK_SELECTION_TYPE_STRING,
 	    8,			/* 8 bits per character */
-	    buf, strlen(buf)
+	    (guchar *)buf, strlen(buf)
 	);
 
 	g_free(buf);
@@ -484,7 +484,7 @@
 	    )
 	    {
 		gchar *path = EditorDNDParseURL(
-		    selection_data->data, selection_data->length
+		    (gchar *)selection_data->data, selection_data->length
 		);
 
 		/* Load manual page into target viewer's view text */
--- manedit-0.7.1/manedit/viewerfio.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/viewerfio.c	2006-11-12 02:40:38.000000000 +0900
@@ -4,6 +4,8 @@
 #include <gtk/gtk.h>
 #include <unistd.h>
 
+#include <stdio.h>
+
 #include "../include/fio.h"
 #include "../include/disk.h"
 #include "../include/string.h"
@@ -174,11 +176,17 @@
 	stdout_path = STRDUP(PrefixPaths(
 	    prog_tmp_dir, "preview_stdoutXXXXXX"
 	));
-	mkstemp(stdout_path);
+	if ((mkstemp(stdout_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", stdout_path);
+	  exit (1);
+	}
 	stderr_path = STRDUP(PrefixPaths(
 	    prog_tmp_dir, "preview_stderrXXXXXX"
 	));
-	mkstemp(stderr_path);
+	if ((mkstemp(stderr_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", stderr_path);
+	  exit (1);
+	}
 
 	/* Delete prog_tmp_dir, it is no longer needed */
 	g_free(prog_tmp_dir);


--- NEW FILE manview.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=ManView
Comment=UNIX Manual Page Viewer
Exec=manview
Icon=mp_viewer
Terminal=false
Type=Application
Categories=Application;Graphics;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:51:28 -0000	1.3
+++ .cvsignore	13 Nov 2006 09:10:27 -0000	1.4
@@ -1 +1 @@
-manedit-0.5.11.tar.bz2
+manedit-0.7.1.tar.bz2


Index: manedit.desktop
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/manedit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manedit.desktop	8 Nov 2004 04:50:55 -0000	1.1
+++ manedit.desktop	13 Nov 2006 09:10:27 -0000	1.2
@@ -1,7 +1,10 @@
 [Desktop Entry]
-Type=Application
+Version=1.0
+Encoding=UTF-8
+Name=ManEdit
+Comment=UNIX Manual Page Editor
 Exec=manedit
-Icon=/usr/share/icons/manedit.xpm
-Name=Manpage Editor
-Terminal=0
-Comment=GUI editor for creating man pages.
+Icon=manedit
+Terminal=false
+Type=Application
+Categories=Application;Development;


Index: manedit.spec
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/manedit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- manedit.spec	2 Mar 2006 21:30:45 -0000	1.12
+++ manedit.spec	13 Nov 2006 09:10:27 -0000	1.13
@@ -1,79 +1,142 @@
 Name:           manedit
-Version:        0.5.11
-Release:        5
-Summary:        GUI editor for creating man pages
+Version:        0.7.1
+Release:        5%{?dist}
+Summary:        UNIX Manual Page Editor
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://wolfpack.twu.net/ManEdit/
-Source0:        ftp://wolfpack.twu.net/users/wolfpack/manedit-0.5.11.tar.bz2
+Source0:        http://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
 Source1:        manedit.desktop
-Patch:          manedit-0.5.11-bzip2.patch
-Patch1:         manedit-0.5.11-nostrip.patch
-Patch2:         manedit-0.5.11-multilib.patch
-Patch3:         manedit-0.5.11-gcc4.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source2:        manview.desktop
+Patch0:         manedit-0.7.1-makefile.patch
+Patch1:         manedit-0.7.1-allow-more_section.patch
+Patch2:         manedit-0.7.1-manbase.patch
+Patch3:         manedit-0.7.1-remove-some-warning.patch
 
-BuildRequires:  gtk+-devel zlib-devel desktop-file-utils bzip2-devel
-Requires:       groff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# This is gtk+ package
+BuildRequires:  gtk+-devel
+BuildRequires:  zlib-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  desktop-file-utils
+Requires:       man
 
 %description
-ManEdit is a UNIX Manual Page Integrated Development Environment.
-It has full UNIX manual page editing capabilities using an XML
-interface with instant preview. ManEdit uses the GTK+ widget set
-and requires the X Window Systems.
-
-%prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
+ManEdit is a UNIX manual page editor and viewer, 
+it is designed specifically for the editing of the 
+UNIX manual page format using an integrated XML interface.
 
-EOT
-exit 1
+NOTE: This is a gtk+ package and some characters,
+especially UTF-8 characters will be garbled.
 
+%prep
 %setup -q
-%patch -p1 -b .bzip2
-%patch1 -p1 -b .nostrip
-%patch2 -p1 -b .multilib
-%patch3 -p1 -b .gcc4
-perl -pi -e "s|/usr/man|%{_mandir}|" manedit/pref.c
-perl -pi -e "s|/usr/man|%{_mandir}|" manedit/prefcb.c
-perl -pi -e "s|\@LIB\@|%{_lib}|" manedit/platforms.ini
+
+# Base Makefile on FreeBSD style
+%{__cp} -p ./manedit/Makefile.FreeBSD ./manedit/Makefile
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .section
+%patch2 -p1 -b .manbase
+%patch3 -p1 -b .warn
 
 %build
-#manedit uses some weird configuration system
-# --disable=bzip2 to build without Bzip2 support
-CFLAGS=$RPM_OPT_FLAGS ./configure Linux --prefix=%{_prefix}  --mandir=%{_mandir} \
---disable=arch-i486 --disable=arch-i586 --disable=arch-i686 --disable=arch-pentiumpro
-make %{?_smp_mflags}
+# I cannot understand this configure!!
+#%%configure
 
-%install
-rm -rf $RPM_BUILD_ROOT
-make  MAN_DIR=$RPM_BUILD_ROOT/%{_mandir}/man1/ PREFIX=$RPM_BUILD_ROOT/%{_prefix} install
+pushd manedit
+%{__make} %{?_smp_mflags} \
+   OPTFLAGS="$RPM_OPT_FLAGS -DHAVE_GZIP -DHAVE_BZIP2" \
+   LDFLAGS="-lz -lbz2"
+%{__make} manedit.1.out ; %{__mv} -f manedit.1.out manedit.1
+popd
 
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
 
-%{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install --vendor fedora                   \
-        --add-category X-Fedora                        \
-        --add-category Application                     \
-        --add-category Development                     \
-        --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-%SOURCE1
+pushd manedit
+%{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}
+%{__make} install PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+# 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 \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   %{SOURCE1}
+
+desktop-file-install \
+   --vendor fedora \
+   --remove-category Application \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   %{SOURCE2}
+
+# install icons
+# size 20 don't seems to be owned by hicolor-icon-theme
+for size in 16x16 48x48 ; do
+   %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/
+   for f in manedit mp_viewer ; do
+      %{__install} -c -p -m 644 images/${f}_${size}.xpm \
+         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/${f}.xpm
+   done
+done
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 
+popd
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS LICENSE README
-%{_bindir}/*
+
+%{_bindir}/man*
+
+%{_datadir}/icons/hicolor/*/apps/*.xpm
+%{_datadir}/applications/fedora-*.desktop
+
 %{_datadir}/%{name}/
-%{_datadir}/icons/*
-%{_mandir}/man1/*
-%{_datadir}/applications/*
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Nov 11 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.1-5
+- Remove some warnings.
+
+* Thu Nov  2 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.1-4
+- Add a comment about gtk+ issue on %%description.
+
+* Tue Oct 31 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.1-3
+- Install manview desktop, related icons.
+- Change Requires.
+- Remove manwrap
+
+* Sun Oct 29 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.1-2
+- Improve Makefile and mandir treatments, patches from Patrice Dumas.
+- Make man page.
+- Correct install directory.
+
+* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.1-1
+- Re-submit to Fedora Extras.
+
 * Thu Apr 14 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.11-5
 - Fix build for GCC4.
 
@@ -97,4 +160,3 @@
 
 * Wed Aug 27 2003 Nils O. Selåsdal <NOS at Utel.no> - 0:0.5.10-0.fdr.1
 - Initial RPM for Fedora
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:51:28 -0000	1.3
+++ sources	13 Nov 2006 09:10:27 -0000	1.4
@@ -1 +1 @@
-0059e183650cf7bae18dd1de4fff1352  manedit-0.5.11.tar.bz2
+229586101245eb61018ff031c2efb247  manedit-0.7.1.tar.bz2


--- manedit-0.5.11-bzip2.patch DELETED ---


--- manedit-0.5.11-gcc4.patch DELETED ---


--- manedit-0.5.11-multilib.patch DELETED ---


--- manedit-0.5.11-nostrip.patch DELETED ---

More information about the scm-commits mailing list