From: Sam hartman Date: Fri, 26 Apr 2013 21:27:34 +0000 (+0100) Subject: Centos packaging updates X-Git-Tag: debian/0.0.5-1~20^2~5 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=radsecproxy.git;a=commitdiff_plain;h=63bda21bd25096b5508d0065bb97c372aa12b5d6 Centos packaging updates --- diff --git a/lib/Makefile.am b/lib/Makefile.am index e4c15fe..8d87ab3 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -58,5 +58,5 @@ libradsec_la_SOURCES += compat.h \ libradsec_la_LDFLAGS = -version-info 0:0:0 -export-symbols radsec.sym libradsec_la_CFLAGS = $(AM_CFLAGS) -I. -I./include -Werror # -DDEBUG -DDEBUG_LEVENT -EXTRA_DIST = libradsec.spec radsec.sym +EXTRA_DIST = libradsec.spec radsec.sym radsecproxy-includes libradsec_la_LIBADD = radius/libradsec-radius.la diff --git a/lib/libradsec.spec.in b/lib/libradsec.spec.in index 6572814..87c25e6 100644 --- a/lib/libradsec.spec.in +++ b/lib/libradsec.spec.in @@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: openssl-devel BuildRequires: libconfuse-devel -BuildRequires: freeradius-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -42,7 +41,7 @@ developing applications that use %{name}. %build export CPPFLAGS='-I%{_includedir}' export LDFLAGS='-L%{_libdir} -L/usr/%{_lib}/freeradius' -%configure --disable-static +%configure --enable-tls make %{?_smp_mflags} @@ -70,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so +%{_libdir}/*.a + + %changelog diff --git a/lib/radius/Makefile.am b/lib/radius/Makefile.am index 96bafae..f0d498f 100644 --- a/lib/radius/Makefile.am +++ b/lib/radius/Makefile.am @@ -1,6 +1,8 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 +BUILT_SOURCES = dictionaries.c + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) AM_CFLAGS = -Wall -g @@ -11,6 +13,7 @@ libradsec_radius_la_SOURCES = \ crypto.c \ custom.c \ dict.c \ + client.h \ id.c \ parse.c \ print.c \ @@ -27,7 +30,7 @@ DICTIONARIES = \ share/dictionary.ukerna \ share/dictionary.abfab.ietf -EXTRA_DIST = $(DICTIONARIES) +EXTRA_DIST = $(DICTIONARIES) convert.pl common.pl header.pl $(top_srcdir)/include/radsec/radius.h dictionaries.c: ${DICTIONARIES} convert.pl common.pl $(srcdir)/convert.pl ${DICTIONARIES}