From f0b826cdb30f9caae9abd8c41f2b6f78d8c07bb8bccff0e5b75ea8843403ec37 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Wed, 28 Aug 2013 06:25:12 +0000
Subject: [PATCH] Accepting request 195766 from home:dstoecker

Please change also the repositories for 12.2,12.3 and Factory for editors project to ":NonFree", so nedit compiles. Since 12.2 motif is in nonfree.

OBS-URL: https://build.opensuse.org/request/show/195766
OBS-URL: https://build.opensuse.org/package/show/editors/nedit?expand=0&rev=9
---
 nedit-5.5CVS-motif.patch          | 12 ++++++++++++
 nedit-5.5_CVS20121026-src.tar.bz2 |  3 ---
 nedit-5.5_CVS20130821-src.tar.bz2 |  3 +++
 nedit.changes                     |  5 +++++
 nedit.spec                        |  6 ++++--
 update.sh                         | 10 ++++++++++
 6 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 nedit-5.5CVS-motif.patch
 delete mode 100644 nedit-5.5_CVS20121026-src.tar.bz2
 create mode 100644 nedit-5.5_CVS20130821-src.tar.bz2
 create mode 100644 update.sh

diff --git a/nedit-5.5CVS-motif.patch b/nedit-5.5CVS-motif.patch
new file mode 100644
index 0000000..c00dcbf
--- /dev/null
+++ b/nedit-5.5CVS-motif.patch
@@ -0,0 +1,12 @@
+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;
+     }
diff --git a/nedit-5.5_CVS20121026-src.tar.bz2 b/nedit-5.5_CVS20121026-src.tar.bz2
deleted file mode 100644
index 466107e..0000000
--- a/nedit-5.5_CVS20121026-src.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:453b6cff87c38281d9b809a563031e9c33dd7bda9e8ea7c3325e9bc6541323b9
-size 1056292
diff --git a/nedit-5.5_CVS20130821-src.tar.bz2 b/nedit-5.5_CVS20130821-src.tar.bz2
new file mode 100644
index 0000000..ee39cff
--- /dev/null
+++ b/nedit-5.5_CVS20130821-src.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9576281ea90f2031ef1afef04f77f9d16f0649c55682a0061f0cca9b14626ef
+size 1058058
diff --git a/nedit.changes b/nedit.changes
index e7ace73..c9024f7 100644
--- a/nedit.changes
+++ b/nedit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 21 04:38:42 UTC 2013 - opensuse@dstoecker.de
+
+- update to CVS from 2013-08-21, fixed compiling with motif 2.3.4
+
 -------------------------------------------------------------------
 Thu Jan 10 12:05:37 UTC 2013 - opensuse@dstoecker.de
 
diff --git a/nedit.spec b/nedit.spec
index 9ba7714..3587177 100644
--- a/nedit.spec
+++ b/nedit.spec
@@ -1,5 +1,5 @@
 Name:           nedit
-Version:        5.5_CVS20121026
+Version:        5.5_CVS20130821
 Release:        1
 License:        GPL-2.0+
 Url:            http://www.nedit.org/
@@ -19,6 +19,7 @@ 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
 
 %description
 NEdit is a GUI style plain text editor for workstations with the X Window System
@@ -27,12 +28,13 @@ mouse support, macro extension language, syntax highlighting,
 and a lot other nice features (and extensions for programmers).
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p0
+%patch6 -p1
 
 %build
 #find -name .cvsignore |xargs rm
diff --git a/update.sh b/update.sh
new file mode 100644
index 0000000..08d8041
--- /dev/null
+++ b/update.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+NAME=nedit
+cvs -d :pserver:anonymous@nedit.cvs.sourceforge.net:/cvsroot/nedit co ${NAME}
+#osc rm $NAME-*.tar.bz2
+date=`date -u +"%Y%m%d"`
+ARC=$NAME-5.5_CVS$date-src.tar.bz2
+tar -cjf $ARC $NAME --exclude "CVS" --exclude ".cvsignore"
+rm -rf $NAME
+#osc add $ARC