rpms/nedit/devel nedit-5.4-makefiles.patch, 1.1, 1.2 nedit.spec, 1.4, 1.5

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/nedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14777/nedit/devel

Modified Files:
	nedit-5.4-makefiles.patch nedit.spec 
Log Message:
* Thu Dec 16 2005 Jindrich Novy <jnovy at redhat.com> 5.5-6
- fix openmotif dependencies
- build with modular X



nedit-5.4-makefiles.patch:

Index: nedit-5.4-makefiles.patch
===================================================================
RCS file: /cvs/extras/rpms/nedit/devel/nedit-5.4-makefiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nedit-5.4-makefiles.patch	27 Jul 2005 08:46:29 -0000	1.1
+++ nedit-5.4-makefiles.patch	16 Dec 2005 15:33:50 -0000	1.2
@@ -12,12 +12,12 @@
  # add -DHAVE__XMVERSIONSTRING to CFLAGS
  #
 -CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
-+CFLAGS=$(RPM_OPT_FLAGS) -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
++CFLAGS=-I/usr/X11R6/include $(RPM_OPT_FLAGS) -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DBUILD_UNTESTED_NEDIT
  
  ARFLAGS=-urs
  
 -LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
-+LIBS= -L/usr/X11R6/$(LIB) -lXm -Xmu -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
++LIBS= -lXm -lXmu -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
  
  include Makefile.common
  


Index: nedit.spec
===================================================================
RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nedit.spec	15 Dec 2005 15:09:57 -0000	1.4
+++ nedit.spec	16 Dec 2005 15:33:50 -0000	1.5
@@ -19,7 +19,7 @@
 License: GPL
 Group: Applications/Editors
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: openmotif-devel >= 2.2.3
+BuildRequires: openmotif-devel >= 2.2.3, libXau-devel, libXpm-devel
 %if %{desktop_file}
 BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
@@ -39,7 +39,9 @@
 %patch5 -p1 -b .nc-manfix
 
 %build
-make linux LIB=%{_lib}
+make linux LIB=%{_lib} << EOF
+
+EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,8 +82,9 @@
 %endif
 
 %changelog
-* Thu Dec 15 2005 Jindrich Novy <jnovy at redhat.com> 5.5-6
-- rebuilt to fix X dependencies
+* Thu Dec 16 2005 Jindrich Novy <jnovy at redhat.com> 5.5-6
+- fix openmotif dependencies
+- build with modular X
 
 * Mon Oct 10 2005 Jindrich Novy <jnovy at redhat.com> 5.5-5
 - update nedit file locations to new xorg standards (#167208, #170937)