[packages/vacm] - added link patch (libvacmclient needs -lssl); package .la for libvacmclient
qboosh
qboosh at pld-linux.org
Thu Sep 5 21:41:21 CEST 2013
commit c1074077a94b3c73ae1532ea6c7ee06bc85af479
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Sep 5 21:41:08 2013 +0200
- added link patch (libvacmclient needs -lssl); package .la for libvacmclient
vacm-link.patch | 14 ++++++++++++++
vacm.spec | 19 +++++++++++--------
2 files changed, 25 insertions(+), 8 deletions(-)
---
diff --git a/vacm.spec b/vacm.spec
index cac8e0e..eb47071 100644
--- a/vacm.spec
+++ b/vacm.spec
@@ -18,6 +18,7 @@ Source0: http://downloads.sourceforge.net/vacm/%{name}-%{version}.tar.gz
# Source0-md5: 8c68f51bded2a6c268e899013d6420f3
Patch0: %{name}-build.patch
Patch1: %{name}-sh.patch
+Patch2: %{name}-link.patch
URL: http://vacm.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
@@ -28,6 +29,7 @@ BuildRequires: gettext-devel
%{?with_gnome1:BuildRequires: gnome-libs-devel}
%{?with_gnome1:BuildRequires: imlib-devel}
BuildRequires: libstdc++-devel
+BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: openjade
BuildRequires: openssl-devel
@@ -225,7 +227,7 @@ install packaging/RedHat/vacm-logrotate $RPM_BUILD_ROOT/etc/logrotate.d/vacm
install packaging/RedHat/vacm.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/vacm
# no external dependencies
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libloose.la
%find_lang flim
@@ -280,17 +282,11 @@ fi
%attr(755,root,root) %{_libdir}/libloose-%{version}.so
%attr(755,root,root) %{_libdir}/libvacmclient-%{version}.so
-%files node
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/vacm_sys_stat_proxy
-%attr(755,root,root) %{_sbindir}/vacm_sys_statd
-%attr(755,root,root) %{_sbindir}/vacm_user_admd
-%attr(754,root,root) /etc/rc.d/init.d/vacm-node
-
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libloose.so
%attr(755,root,root) %{_libdir}/libvacmclient.so
+%{_libdir}/libvacmclient.la
%{_includedir}/libloose.h
%{_includedir}/vacmclient_api.h
@@ -299,6 +295,13 @@ fi
%{_libdir}/libloose.a
%{_libdir}/libvacmclient.a
+%files node
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/vacm_sys_stat_proxy
+%attr(755,root,root) %{_sbindir}/vacm_sys_statd
+%attr(755,root,root) %{_sbindir}/vacm_user_admd
+%attr(754,root,root) /etc/rc.d/init.d/vacm-node
+
%if %{with gtk1}
%files flim -f flim.lang
%defattr(644,root,root,755)
diff --git a/vacm-link.patch b/vacm-link.patch
new file mode 100644
index 0000000..3bd812d
--- /dev/null
+++ b/vacm-link.patch
@@ -0,0 +1,14 @@
+--- vacm-2.0.5a/libvacmclient/Makefile.am.orig 2000-04-27 04:17:52.000000000 +0200
++++ vacm-2.0.5a/libvacmclient/Makefile.am 2013-09-05 21:37:16.489367080 +0200
+@@ -5,9 +5,10 @@
+ libvacmclient_la_SOURCES = connections.c
+ libvacmclient_la_DEPENDENCIES = $(srcdir)/include/vacmclient_api.h $(srcdir)/include/nexxus_connection.h
+ libvacmclient_la_LDFLAGS = -release $(VERSION)
++libvacmclient_la_LIBADD = $(SSL_LIBS)
+
+ INCLUDES = -I$(srcdir)/include -I. -I$(top_srcdir) -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
+-LDADD = -L$(libdir) -L$(prefix)/lib $(THREAD_LIBS) $(MOD_LIBS) $(LIBS)
++LDADD = $(THREAD_LIBS) $(MOD_LIBS) $(LIBS)
+
+ EXTRA_DIST = include/vacmclient_api.h include/nexxus_connection.h
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vacm.git/commitdiff/c1074077a94b3c73ae1532ea6c7ee06bc85af479
More information about the pld-cvs-commit
mailing list