packages: newt/newt-make.patch, newt/newt.spec, newt/newt-gcc34.patch (REMO...

[caleb]

Author: caleb                        Date: Fri Nov  5 15:53:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Up to 0.52.12
- Removed patches applied upstream
- Fixed include path for slang
- Packaged pkgconfig in devel

---- Files affected:
packages/newt:
   newt-make.patch (1.2 -> 1.3) , newt.spec (1.94 -> 1.95) , newt-gcc34.patch (1.1 -> NONE)  (REMOVED), newt-textbox.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/newt/newt-make.patch
diff -u packages/newt/newt-make.patch:1.2 packages/newt/newt-make.patch:1.3
--- packages/newt/newt-make.patch:1.2	Tue Aug 19 21:25:37 2008
+++ packages/newt/newt-make.patch	Fri Nov  5 16:53:15 2010
@@ -1,6 +1,6 @@
---- newt-0.52.10/Makefile.in.orig	2008-08-19 21:13:55.701247852 +0200
-+++ newt-0.52.10/Makefile.in	2008-08-19 21:15:15.285242824 +0200
-@@ -53,19 +53,19 @@
+--- newt-0.52.12/Makefile.in.orig	2010-11-05 17:25:34.729541330 +0200
++++ newt-0.52.12/Makefile.in	2010-11-05 17:29:33.376208002 +0200
+@@ -54,19 +54,19 @@
  all:	$(TARGET) $(SNACKSO)
  
  test:	test.o $(LIBNEWT)
@@ -25,7 +25,7 @@
  
  _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
  	for ver in $(PYTHONVERS) ; do \
-@@ -76,16 +76,16 @@
+@@ -77,16 +77,16 @@
  	touch $@
  
  whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
@@ -38,16 +38,16 @@
  
  dialogboxes.o:   dialogboxes.c
 -	gcc -fPIC $(CFLAGS) -c dialogboxes.c
-+	$(CC) -fPIC $(CFLAGS) $(CPPFLAGS) -c dialogboxes.c
++	$(CC) -fPIC $(CFLAGS) -c dialogboxes.c
  
  whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
--	$(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) -lslang -lpopt -lm
-+	$(CC) -shared $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) -lslang -lpopt -lm
+-	$(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) -lpopt
++	$(CC) -shared $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) -lpopt
  
  $(LIBNEWT): $(LIBOBJS)
  	ar rv $@ $^
-@@ -100,14 +100,15 @@
- 		$(SHAREDDIR)/*.o *.so*
+@@ -101,14 +101,15 @@
+ 		$(SHAREDDIR)/*.o *.so* *.pc
  
  depend:
 -	$(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend

================================================================
Index: packages/newt/newt.spec
diff -u packages/newt/newt.spec:1.94 packages/newt/newt.spec:1.95
--- packages/newt/newt.spec:1.94	Fri Jul  9 13:20:16 2010
+++ packages/newt/newt.spec	Fri Nov  5 16:53:15 2010
@@ -10,16 +10,14 @@
 Summary(pl.UTF-8):	Not Erik's Windowing Toolkit - okna w trybie tekstowym ze slangiem
 Summary(tr.UTF-8):	Not Erik's Windowing Toolkit - metin kipi pencereleme sistemi
 Name:		newt
-Version:	0.52.10
-Release:	4
+Version:	0.52.12
+Release:	1
 License:	LGPL
 Group:		Libraries
 Source0:	https://fedorahosted.org/releases/n/e/newt/%{name}-%{version}.tar.gz
-# Source0-md5:	bcbcc87ec19ba37d34f819209afa2e15
-Patch0:		%{name}-textbox.patch
+# Source0-md5:	51b04128d9e1bf000fa769c417b74486
 Patch1:		%{name}-0.51.6-if1close.patch
 Patch2:		%{name}-PIC.patch
-Patch3:		%{name}-gcc34.patch
 Patch4:		%{name}-nopython.patch
 Patch5:		%{name}-make.patch
 URL:		https://fedorahosted.org/newt/
@@ -160,13 +158,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1 -b .orig
 
+%{__sed} -i -e 's,^#include <slang.h>$,#include <slang/slang.h>,g' dialogboxes.c
+
 %build
 %{__autoconf}
 %configure \
@@ -217,6 +215,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnewt.so
 %{_includedir}/newt.h
+%{_pkgconfigdir}/libnewt.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -246,6 +245,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2010/11/05 15:53:15  caleb
+- Up to 0.52.12
+- Removed patches applied upstream
+- Fixed include path for slang
+- Packaged pkgconfig in devel
+
 Revision 1.94  2010/07/09 11:20:16  arekm
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/newt/newt-make.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/newt/newt.spec?r1=1.94&r2=1.95&f=u