diff --git a/nedit-5.5-nocsh.patch b/nedit-5.5-nocsh.patch new file mode 100644 index 0000000..a2c56b3 --- /dev/null +++ b/nedit-5.5-nocsh.patch @@ -0,0 +1,15 @@ +diff -up nedit-5.5/source/preferences.c.nocsh nedit-5.5/source/preferences.c +--- nedit-5.5/source/preferences.c.nocsh 2004-08-20 21:33:20.000000000 +0200 ++++ nedit-5.5/source/preferences.c 2007-10-29 13:07:26.000000000 +0100 +@@ -926,11 +926,7 @@ static PrefDescripRec PrefDescrip[] = { + (void *)sizeof(PrefData.tooltipBgColor), False}, + + {"shell", "Shell", PREF_STRING, +-#if defined(__MVS__) || defined(__EMX__) + "/bin/sh", +-#else +- "/bin/csh", +-#endif + PrefData.shell, (void *)sizeof(PrefData.shell), False}, + {"geometry", "Geometry", PREF_STRING, "", + PrefData.geometry, (void *)sizeof(PrefData.geometry), False}, diff --git a/nedit-5.5-scroll.patch b/nedit-5.5-scroll.patch new file mode 100644 index 0000000..ba75aba --- /dev/null +++ b/nedit-5.5-scroll.patch @@ -0,0 +1,22 @@ +diff -up nedit-5.5/util/misc.c.scroll nedit-5.5/util/misc.c +--- nedit-5.5/util/misc.c.scroll 2007-10-29 13:09:28.000000000 +0100 ++++ nedit-5.5/util/misc.c 2007-10-29 13:59:22.000000000 +0100 +@@ -2032,12 +2032,12 @@ void AddMouseWheelSupport(Widget w) + if (XmIsScrolledWindow(XtParent(w))) + { + static const char scrollTranslations[] = +- "Shift,: scrolled-window-scroll-up(1)\n" +- "Shift,: scrolled-window-scroll-down(1)\n" +- "Ctrl,: scrolled-window-page-up()\n" +- "Ctrl,: scrolled-window-page-down()\n" +- ",: scrolled-window-scroll-up(3)\n" +- ",: scrolled-window-scroll-down(3)\n"; ++ "Shift: scrolled-window-scroll-up(1)\n" ++ "Shift: scrolled-window-scroll-down(1)\n" ++ "Ctrl: scrolled-window-page-up()\n" ++ "Ctrl: scrolled-window-page-down()\n" ++ ": scrolled-window-scroll-up(3)\n" ++ ": scrolled-window-scroll-down(3)\n"; + static XtTranslations trans_table = NULL; + + if (trans_table == NULL) diff --git a/nedit.spec b/nedit.spec index 6a46917..e35a589 100644 --- a/nedit.spec +++ b/nedit.spec @@ -1,11 +1,7 @@ -%define desktop_file 1 -%if %{desktop_file} -%define desktop_file_utils_version 0.2.93 -%endif -Summary: A GUI text editor for systems with X and Motif. +Summary: A GUI text editor for systems with X Name: nedit Version: 5.5 -Release: 12%{?dist} +Release: 13%{?dist} Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png @@ -16,18 +12,18 @@ Patch3: nedit-5.5-motif223.patch Patch4: nedit-5.5-varfix.patch Patch5: nedit-5.5-nc-manfix.patch Patch6: nedit-5.5-visfix.patch +Patch7: nedit-5.5-nocsh.patch +Patch8: nedit-5.5-scroll.patch URL: http://nedit.org License: GPLv2 Group: Applications/Editors Requires: lesstif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: lesstif-devel, libXau-devel, libXpm-devel, libXmu-devel -%if %{desktop_file} -BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version} -%endif +BuildRequires: desktop-file-utils %description -NEdit is a GUI text editor for the X Window System and Motif. NEdit is +NEdit is a GUI text editor for the X Window System. NEdit is very easy to use, especially if you are familiar with the Macintosh(TM) or Microsoft(TM) Windows(TM) style of interface. @@ -40,6 +36,8 @@ Macintosh(TM) or Microsoft(TM) Windows(TM) style of interface. %patch4 -p1 -b .varfix %patch5 -p1 -b .nc-manfix %patch6 -p1 -b .visfix +%patch7 -p1 -b .nocsh +%patch8 -p1 -b .scroll %build make linux LIB=%{_lib} << EOF @@ -59,7 +57,7 @@ install -m 644 doc/nedit-client.man $RPM_BUILD_ROOT%{_mandir}/man1/nedit-client. mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/applnk/Applications -%if %{desktop_file} + mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/applications @@ -67,7 +65,6 @@ desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_prefix}/share/applications \ --add-category "Application;Development;X-Fedora" \ $RPM_BUILD_ROOT/etc/X11/applnk/Applications/nedit.desktop -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -77,19 +74,20 @@ rm -rf $RPM_BUILD_ROOT %doc doc/nedit.doc README ReleaseNotes %{_mandir}/*/* %{_bindir}/* -%if %{desktop_file} %{_prefix}/share/applications/* %{_datadir}/pixmaps/nedit-icon.png -%else -%config /etc/X11/applnk/Applications/nedit.desktop -%endif %changelog -* Thu Aug 23 2007 Jindrich Novy 5.6-12 +* Sat Nov 10 2007 Jindrich Novy 5.5-13 +- make mouse wheel scrolling compatible with lesstif (#354591) +- don't use /bin/csh but /bin/sh as default shell (#355441) +- spec cleanup + +* Thu Aug 23 2007 Jindrich Novy 5.5-12 - update License - rebuild for BuildID -* Mon Jan 8 2007 Jindrich Novy 5.6-11 +* Mon Jan 8 2007 Jindrich Novy 5.5-11 - explicitly depend on lesstif to avoid nedit crashes (binary lesstif/openmotif incompatibilities) (#221535) - fix buildroot