packages: libnasl/libnasl.spec, libnasl/libnasl-libtool.patch (NEW) - rel 5...

[baggins]

Author: baggins                      Date: Thu Apr 15 11:56:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- fixed libtool usage

---- Files affected:
packages/libnasl:
   libnasl.spec (1.30 -> 1.31) , libnasl-libtool.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libnasl/libnasl.spec
diff -u packages/libnasl/libnasl.spec:1.30 packages/libnasl/libnasl.spec:1.31
--- packages/libnasl/libnasl.spec:1.30	Mon Apr 12 21:26:30 2010
+++ packages/libnasl/libnasl.spec	Thu Apr 15 13:56:21 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Biblioteki NASL
 Name:		libnasl
 Version:	2.2.7
-Release:	4
+Release:	5
 License:	GPL
 Vendor:		Nessus Project
 Group:		Networking
@@ -11,6 +11,7 @@
 # Source0-md5:	37f6f0db022dad1e218371909de3e8af
 Patch0:		%{name}-ac_fix.patch
 Patch1:		%{name}-linkshared.patch
+Patch2:		%{name}-libtool.patch
 URL:		http://www.nessus.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -82,6 +83,7 @@
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -132,6 +134,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2010/04/15 11:56:21  baggins
+- rel 5
+- fixed libtool usage
+
 Revision 1.30  2010/04/12 19:26:30  arekm
 - release 4
 

================================================================
Index: packages/libnasl/libnasl-libtool.patch
diff -u /dev/null packages/libnasl/libnasl-libtool.patch:1.1
--- /dev/null	Thu Apr 15 13:56:27 2010
+++ packages/libnasl/libnasl-libtool.patch	Thu Apr 15 13:56:21 2010
@@ -0,0 +1,27 @@
+--- libnasl/nasl/Makefile~	2010-04-15 13:51:42.465124464 +0200
++++ libnasl/nasl/Makefile	2010-04-15 13:52:26.041186871 +0200
+@@ -88,7 +88,7 @@
+ 	nasl_server.c \
+ 	nasl_debug.c
+ 
+-COMPILE = $(LIBTOOL) $(CC) $(CFLAGS) $(NESSUS_INCLUDE)
++COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(NESSUS_INCLUDE)
+ all : cflags libnasl.la nasl
+ 
+ .c.o:
+@@ -101,13 +101,13 @@
+ 	$(CC) $(CFLAGS)  $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c -L.libs -lnasl $(NESSUS_LIBS) 
+ 
+ libnasl.la : cflags $(OBJS)
+-	$(COMPILE) $(NESSUS_LIBS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
++	$(LIBTOOL) --mode=link $(CC) $(NESSUS_LIBS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
+ 	-version-info ${PACKAGE_VERSION}
+ 
+ install : libnasl.la nasl
+ 	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
+ 	test -d $(DESTDIR)${bindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${bindir}
+-	$(LIBTOOL) --mode install $(INSTALL) libnasl.la $(DESTDIR)${libdir}/libnasl.la
++	$(LIBTOOL) --mode=install $(INSTALL) libnasl.la $(DESTDIR)${libdir}/libnasl.la
+ 	$(LIBTOOL) --finish $(DESTDIR)${libdir}
+ 	test -d $(DESTDIR)${bindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${bindir}
+ 	$(INSTALL) nasl $(DESTDIR)${bindir}/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libnasl/libnasl.spec?r1=1.30&r2=1.31&f=u