packages: lwp/lwp-configure.patch, lwp/lwp.spec - Up to 2.6, NFY

[caleb]

Author: caleb                        Date: Sat Jul 17 15:14:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Up to 2.6, NFY

---- Files affected:
packages/lwp:
   lwp-configure.patch (1.2 -> 1.3) , lwp.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: packages/lwp/lwp-configure.patch
diff -u packages/lwp/lwp-configure.patch:1.2 packages/lwp/lwp-configure.patch:1.3
--- packages/lwp/lwp-configure.patch:1.2	Sun Mar  2 17:22:33 2008
+++ packages/lwp/lwp-configure.patch	Sat Jul 17 17:14:12 2010
@@ -1,18 +1,17 @@
-diff -uNr lwp-1.9/configure.in lwp-1.9.new/configure.in
---- lwp-2.4/configure.in.orig	2008-03-02 15:45:12.000000000 +0000
-+++ lwp-2.4/configure.in	2008-03-02 15:45:56.000000000 +0000
+--- lwp-2.6/configure.in~	2010-03-17 14:32:51.000000000 -0600
++++ lwp-2.6/configure.in	2010-07-17 10:48:14.000000000 -0600
 @@ -14,7 +14,7 @@
  dnl   first to 0
  dnl - if any interfaces were added, increment third
  dnl - if any interfaces were removed, set third to 0
--CODA_LIBRARY_VERSION(7, 2, 0)
+-CODA_LIBRARY_VERSION(9, 2, 0)
 +CODA_LIBRARY_VERSION()
  
  CONFIG_DATE=`date +"%a, %d %b %Y %T %z"`
  AC_SUBST(CONFIG_DATE, "$CONFIG_DATE", [Date when configure was last run])
-@@ -25,6 +25,11 @@
- AC_PROG_MAKE_SET
- AM_PROG_LIBTOOL
+@@ -35,6 +35,11 @@
+ dnl pkg-config stuff
+ CODA_PKG_CONFIG
  
 +CCASFLAGS="$ASFLAGS"
 +CCAS="$AS"
@@ -21,7 +20,7 @@
 +
  dnl Checks for libraries.
  AC_SUBST(LIBPTHREAD)
- AC_ARG_ENABLE(pthread,
+ AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
 @@ -45,7 +50,7 @@
  AC_CHECK_TYPES(stack_t,,, [#include <signal.h>])
  

================================================================
Index: packages/lwp/lwp.spec
diff -u packages/lwp/lwp.spec:1.40 packages/lwp/lwp.spec:1.41
--- packages/lwp/lwp.spec:1.40	Sun Mar  2 17:21:25 2008
+++ packages/lwp/lwp.spec	Sat Jul 17 17:14:12 2010
@@ -1,14 +1,17 @@
 # $Revision$, $Date$
+# TODO:
+# - Fix build so __aclocal doesn't kill it.
+# - Patch0 no longer needed?
 Summary:	LWP thread library
 Summary(pl.UTF-8):	Biblioteka wątków LWP
 Summary(pt_BR.UTF-8):	Biblioteca LWP thread
 Name:		lwp
-Version:	2.4
+Version:	2.6
 Release:	0.1
 License:	LGPL v2
 Group:		Libraries
 Source0:	ftp://ftp.coda.cs.cmu.edu/pub/lwp/src/%{name}-%{version}.tar.gz
-# Source0-md5:	5bd3221562de580d51f18c547f7606e3
+# Source0-md5:	65ba6faddf2c9741d4a481b0e9661a34
 Patch0:		%{name}-configure.patch
 URL:		http://www.coda.cs.cmu.edu/
 BuildRequires:	autoconf >= 2.50
@@ -71,13 +74,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 
 %build
 rm -f configure.ac
 %{__libtoolize}
 %{__autoheader}
-%{__aclocal}
+#%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure
@@ -105,6 +108,7 @@
 %attr(755,root,root) %{_libdir}/liblwp.so
 %{_libdir}/liblwp.la
 %{_includedir}/lwp
+%{_pkgconfigdir}/lwp.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -116,6 +120,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2010/07/17 15:14:12  caleb
+- Up to 2.6, NFY
+
 Revision 1.40  2008/03/02 16:21:25  wolvverine
 - up to 2.4, NFY
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lwp/lwp-configure.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lwp/lwp.spec?r1=1.40&r2=1.41&f=u