update

OBS-URL: https://build.opensuse.org/package/show/editors/nedit?expand=0&rev=16

nedit-5.5CVS-motif.patch

@@ -1,12 +0,0 @@
-diff -ur nedit/util/motif.c nedit_fix/util/motif.c
---- nedit/util/motif.c	2012-10-25 15:51:20.000000000 +0200
-+++ nedit_fix/util/motif.c	2013-08-21 06:40:14.649187774 +0200
-@@ -151,7 +151,7 @@
-     {
-         result = MotifKnownBad;
-     }
--    else if (XmFullVersion >= 200203 && XmFullVersion <= 200303) /* 2.2.3 - 2.3 is good */
-+    else if (XmFullVersion >= 200203 && XmFullVersion <= 200304) /* 2.2.3 - 2.3 is good */
-     {
-         result = MotifKnownGood;
-     }

nedit-5.6-malloc-return-pointers.patch

@@ -1,18 +0,0 @@
---- util/nedit_malloc.c
-+++ util/nedit_malloc.c
-@@ -45,6 +45,7 @@
-         fprintf(stderr,"NEditMalloc(%lu) failed\n", (unsigned long)size);
-         exit(1);
-     }
-+    return ptr;
- }
- 
- 
-@@ -63,6 +64,7 @@
-         fprintf(stderr,"NEditRealloc(%lu) failed\n", (unsigned long)new_size);
-         exit(1);
-     }
-+    return new_ptr;
- }
- 
- 

nedit-5.6_GIT20150410-src.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16a4b6a270794be2b1933404780d2cc50bb9e02589e7306d214d012422dfe2b0
-size 7450586

nedit-5.6_GIT20151030-src.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60db96dfe3abaf485ef3015a00cb5de0c54fde93871db86eea7b5ff480ecca6b
+size 7487694

nedit-5.6_builddate_fix.patch

@@ -0,0 +1,51 @@
+diff --git a/source/help.c b/source/help.c
+index 7da0d4b..09dbf6c 100644
+--- a/source/help.c
++++ b/source/help.c
+@@ -229,8 +229,7 @@ static const char *getBuildInfo(void)
+ {
+     static const char *bldFormat =
+         "%s\n"
+-        "     Built on: %s, %s, %s\n"
+-        "     Built at: %s, %s\n"
++        "     Built on: openSUSE BuildService\n"
+         "   With Motif: %s%d.%d.%d [%s]\n"
+         "Running Motif: %d.%d [%s]\n"
+         "       Server: %s %d\n"
+@@ -269,8 +268,6 @@ static const char *getBuildInfo(void)
+ 
+         sprintf(bldInfoString, bldFormat,
+              NEditVersion,
+-             COMPILE_OS, COMPILE_MACHINE, COMPILE_COMPILER,
+-             linkdate, linktime,
+              stabilities[stab], XmVERSION, XmREVISION, XmUPDATE_LEVEL,
+              XmVERSION_STRING, 
+              xmUseVersion/1000, xmUseVersion%1000,
+diff --git a/source/linkdate.c b/source/linkdate.c
+index 6ead1db..7711943 100644
+--- a/source/linkdate.c
++++ b/source/linkdate.c
+@@ -33,6 +33,3 @@
+ #ifdef HAVE_DEBUG_H
+ #include "../debug.h"
+ #endif
+-
+-const char linkdate[] = __DATE__;
+-const char linktime[] = __TIME__;
+diff --git a/source/nc.c b/source/nc.c
+index db2ed5a..59476aa 100644
+--- a/source/nc.c
++++ b/source/nc.c
+@@ -1002,10 +1002,7 @@ static void copyCommandLineArg(CommandLine *commandLine, const char *arg)
+ static void printNcVersion(void ) {
+    static const char *const ncHelpText = \
+    "nc (NEdit) Version 5.6 (November 2009)\n\n\
+-     Built on: %s, %s, %s\n\
+-     Built at: %s, %s\n";
++     Built on: openSUSE BuildService\n";
+      
+-    fprintf(stdout, ncHelpText,
+-                  COMPILE_OS, COMPILE_MACHINE, COMPILE_COMPILER,
+-                  __DATE__, __TIME__);
++    fprintf(stdout, ncHelpText);
+ }

nedit.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 30 07:41:30 UTC 2015 - opensuse@dstoecker.de
+
+- update to recent GIT (5.7 early release, still mainly tagged as 5.6)
+- drop obsolete patches (included upstream):
+  * nedit-5.5CVS-motif.patch
+  * nedit-5.6-malloc-return-pointers.patch
+
 -------------------------------------------------------------------
 Fri Apr 10 09:31:57 UTC 2015 - drahn@suse.com
 

nedit.spec

@@ -1,5 +1,5 @@
 Name:           nedit
-Version:        5.6_GIT20150410
+Version:        5.6_GIT20151030
 Release:        1
 License:        GPL-2.0+
 Url:            http://sourceforge.net/projects/nedit/
@@ -19,8 +19,8 @@ Patch2:         %{name}-5.5CVS-security.patch
 Patch3:         %{name}-5.5CVS-nc-manfix.patch
 Patch4:         %{name}-5.5-visfix.patch
 Patch5:         %{name}-5.5CVS-utf8.patch
-Patch6:         %{name}-5.5CVS-motif.patch
-Patch7:			%{name}-5.6-malloc-return-pointers.patch
+#PATCH-FIX-OPENSUSE do not include data and time in binary
+PATCH6:         %{name}-5.6_builddate_fix.patch
 
 %description
 NEdit is a GUI style plain text editor for workstations with the X Window System
@@ -36,11 +36,8 @@ and a lot other nice features (and extensions for programmers).
 %patch4 -p1
 %patch5 -p0
 %patch6 -p1
-%patch7 -p0
 
 %build
-#find -name .cvsignore |xargs rm
-#find -name CVS |xargs rm -r
 %if 0%{?suse_version} <= 1010
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -L/usr/X11R6/%{_lib}" \
      linux

update.sh

@@ -4,9 +4,10 @@ NAME=nedit
 git clone git://git.code.sf.net/p/nedit/git ${NAME}
 osc rm $NAME-*.tar.bz2
 REV=`sed -n 's/RELEASE=nedit-\([0-9.]\+\).*/\1/p' ${NAME}/Makefile`
+#REV=`sed -n 's/.*NEDIT_VERSION \+\([0-9.]\+\).*/\1/p' ${NAME}/source/nedit.h`.`sed -n 's/.*NEDIT_REVISION \+\([0-9.]\+\).*/\1/p' ${NAME}/source/nedit.h`
 date=`date -u +"%Y%m%d"`
 rev=${REV}_GIT$date
-ARC=$NAME-5.6_GIT$date-src.tar.bz2
+ARC=$NAME-${REV}_GIT$date-src.tar.bz2
 tar -cjf $ARC $NAME --exclude "CVS" --exclude ".cvsignore"
 rm -rf $NAME
 echo "New revision $rev"