From dab563872d5abe5f76a70599957b583d0555c2ad Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Oct 17 2005 08:16:21 +0000 Subject: - update nedit file locations to new xorg standards (#167208, #170937) - rename nc to nedit-client to avoid conflict with netcat and modify its manpage to reflect this - fix License to GPL --- diff --git a/nedit-5.5-nc-manfix.patch b/nedit-5.5-nc-manfix.patch new file mode 100644 index 0000000..d7d8c7e --- /dev/null +++ b/nedit-5.5-nc-manfix.patch @@ -0,0 +1,118 @@ +--- nedit-5.5/doc/nc.man.nc-manfix 2004-09-30 23:03:59.000000000 +0200 ++++ nedit-5.5/doc/nc.man 2005-10-16 08:53:42.000000000 +0200 +@@ -128,30 +128,30 @@ + .rm #[ #] #H #V #F C + .\" ======================================================================== + .\" +-.IX Title "NC 1" +-.TH NC 1 "2004-07-21" "NEdit 5.5" "NEdit documentation" ++.IX Title "NEDIT-CLIENT 1" ++.TH NEDIT-CLIENT 1 "2004-07-21" "NEdit 5.5" "NEdit documentation" + .SH "NAME" +-nc \- Client program for NEdit text editor ++nedit-client \- Client program for NEdit text editor + .SH "SYNOPSYS" + .IX Header "SYNOPSYS" +-nc [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR] +- [\fB\-ask\fR] [\fB\-noask\fR] [\fB\-svrname\fR \fIname\fR] [\fB\-svrcmd\fR \fIcommand\fR] +- [\fB\-lm\fR \fIlanguagemode\fR] +- [\fB\-geometry\fR \fIgeometry\fR | \fB\-g\fR \fIgeometry\fR] [\fB\-icon\fR | \fB\-iconic\fR] +- [\fB\-display\fR \fI[host]:server[.screen]\fR] +- [\fB\-timeout\fR \fIseconds\fR] [\fB\-wait\fR] [\fB\-xrm\fR \fIresourcestring\fR] +- [\fB\-tabbed\fR] [\fB\-untabbed\fR] [\fB\-group\fR] +- [\fB\-V\fR | \fB\-version\fR] [\fB\-\-\fR] [file...] ++nedit-client [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR] ++ [\fB\-ask\fR] [\fB\-noask\fR] [\fB\-svrname\fR \fIname\fR] [\fB\-svrcmd\fR \fIcommand\fR] ++ [\fB\-lm\fR \fIlanguagemode\fR] ++ [\fB\-geometry\fR \fIgeometry\fR | \fB\-g\fR \fIgeometry\fR] [\fB\-icon\fR | \fB\-iconic\fR] ++ [\fB\-display\fR \fI[host]:server[.screen]\fR] ++ [\fB\-timeout\fR \fIseconds\fR] [\fB\-wait\fR] [\fB\-xrm\fR \fIresourcestring\fR] ++ [\fB\-tabbed\fR] [\fB\-untabbed\fR] [\fB\-group\fR] ++ [\fB\-V\fR | \fB\-version\fR] [\fB\-\-\fR] [file...] + .SH "DESCRIPTION" + .IX Header "DESCRIPTION" +-\&\fBnc\fR is the client interface to the NEdit text editor. A server can be started ++\&\fBnedit-client\fR is the client interface to the NEdit text editor. A server can be started + explicitly by running NEdit in server mode: + .PP + .Vb 1 + \& nedit -server + .Ve + .PP +-If no server is running, \fBnc\fR will start one unless configured otherwise. ++If no server is running, \fBnedit-client\fR will start one unless configured otherwise. + Client/server mode is useful for integrating NEdit with software development + environments, mailers, and other programs; or just as a quick way to open files + from the shell command line without starting a new NEdit session. +@@ -171,21 +171,21 @@ Go to line number \fIn\fR. + Execute an NEdit macro or action on the file following the \-do argument on the + command line. + .Sp +-If you use this command without a filename, \fBnc\fR would randomly choose one ++If you use this command without a filename, \fBnedit-client\fR would randomly choose one + window to focus and execute the macro in. + .IP "\fB\-ask\fR, \fB\-noask\fR" 4 + .IX Item "-ask, -noask" +-Instructs \fBnc\fR whether to automatically start a server if one is not ++Instructs \fBnedit-client\fR whether to automatically start a server if one is not + available. This overrides the X resource `nc.autoStart'. + .IP "\fB\-svrname\fR \fIname\fR" 4 + .IX Item "-svrname name" +-Explicitly instructs \fBnc\fR which server to connect to, an instance of ++Explicitly instructs \fBnedit-client\fR which server to connect to, an instance of + \&\fInedit\fR\|(1) with a corresponding \fB\-svrname\fR argument. By naming servers, you + can run several simultaneously, and direct files and commands specifically to + any one. + .IP "\fB\-svrcmd\fR \fIcommand\fR" 4 + .IX Item "-svrcmd command" +-The command which \fBnc\fR uses to start an NEdit server. It is also settable via ++The command which \fBnedit-client\fR uses to start an NEdit server. It is also settable via + the X resource `nc.serverCommand', by default, \fI\*(L"nedit \-server\*(R"\fR. + .IP "\fB\-lm\fR \fIlanguagemode\fR" 4 + .IX Item "-lm languagemode" +@@ -221,11 +221,11 @@ Under rare conditions (such as a slow co + increase the time-out period. In most cases, the default is fine. + .IP "\fB\-wait\fR" 4 + .IX Item "-wait" +-Instructs \fBnc\fR not to return to the shell until all files given ++Instructs \fBnedit-client\fR not to return to the shell until all files given + are closed. + .Sp +-Normally, \fBnc\fR returns once the files given in its command line +-are opened by the server. When this option is given, nc returns ++Normally, \fBnedit-client\fR returns once the files given in its command line ++are opened by the server. When this option is given, nedit-client returns + only after the last file given in this call is closed. + Note that this option affects all files, not only the ones + following this option in the command line. +@@ -262,11 +262,11 @@ for your display: + .Ve + .SH "NOTES" + .IX Header "NOTES" +-Communication between \fInc\fR\|(1) and \fInedit\fR\|(1) is through the X display. So as +-long as X windows is set up and working properly, \fBnc\fR will work properly +-as well. \fBnc\fR uses the `\s-1DISPLAY\s0' environment variable, the machine name and ++Communication between \fInedit-client\fR\|(1) and \fInedit\fR\|(1) is through the X display. So as ++long as X windows is set up and working properly, \fBnedit-client\fR will work properly ++as well. \fBnedit-client\fR uses the `\s-1DISPLAY\s0' environment variable, the machine name and + your user name to find the appropriate server, meaning, if you have several +-machines sharing a common file system, \fBnc\fR will not be able to find a server ++machines sharing a common file system, \fBnedit-client\fR will not be able to find a server + that is running on a machine with a different host name, even though it may be + perfectly appropriate for editing a given file. + .PP +@@ -275,12 +275,12 @@ command line, for example: + .IP "incorrect:" 4 + .IX Item "incorrect:" + .Vb 1 +-\& nc file.c -line 25 ++\& nedit-client file.c -line 25 + .Ve + .IP "correct:" 4 + .IX Item "correct:" + .Vb 1 +-\& nc -line 25 file.c ++\& nedit-client -line 25 file.c + .Ve + .PP + For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit diff --git a/nedit.spec b/nedit.spec index b46a0d5..05d34a3 100644 --- a/nedit.spec +++ b/nedit.spec @@ -5,7 +5,7 @@ Summary: A GUI text editor for systems with X and Motif. Name: nedit Version: 5.5 -Release: 4 +Release: 5 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png @@ -14,8 +14,9 @@ Patch1: nedit-5.4-makefiles.patch Patch2: nedit-5.5-utf8.patch Patch3: nedit-5.5-motif223.patch Patch4: nedit-5.5-varfix.patch +Patch5: nedit-5.5-nc-manfix.patch URL: http://nedit.org -License: distributable +License: GPL Group: Applications/Editors BuildRoot: %{_tmppath}/%{name}-root BuildRequires: openmotif-devel >= 2.2.3 @@ -35,6 +36,7 @@ Macintosh(TM) or Microsoft(TM) Windows(TM) style of interface. %patch2 -p1 -b .utf8 %patch3 -p1 -b .motif223 %patch4 -p1 -b .varfix +%patch5 -p1 -b .nc-manfix %build make linux LIB=%{_lib} @@ -42,11 +44,13 @@ make linux LIB=%{_lib} %install rm -rf $RPM_BUILD_ROOT -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1 -install -s -m 755 source/nedit source/nc $RPM_BUILD_ROOT%{_prefix}/X11R6/bin -install -m 644 doc/nedit.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/nedit.1x -install -m 644 doc/nc.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/nc.1x +install -d -m 755 $RPM_BUILD_ROOT%{_bindir} +install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1 +mv source/nc source/nedit-client +install -s -m 755 source/nedit source/nedit-client $RPM_BUILD_ROOT%{_bindir} +install -m 644 doc/nedit.man $RPM_BUILD_ROOT%{_mandir}/man1/nedit.1x +mv doc/nc.man doc/nedit-client.man +install -m 644 doc/nedit-client.man $RPM_BUILD_ROOT%{_mandir}/man1/nedit-client.1x mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/applnk/Applications @@ -66,8 +70,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc doc/nedit.doc README ReleaseNotes -%{_prefix}/X11R6/man/*/* -%{_prefix}/X11R6/bin/* +%{_mandir}/*/* +%{_bindir}/* %if %{desktop_file} %{_prefix}/share/applications/* %{_datadir}/pixmaps/nedit-icon.png @@ -76,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Oct 10 2005 Jindrich Novy 5.5-5 +- update nedit file locations to new xorg standards (#167208, #170937) +- rename nc to nedit-client to avoid conflict with netcat and + modify its manpage to reflect this +- fix License to GPL + * Wed Jul 27 2005 Jindrich Novy 5.5-4 - initial Extras built