- release 6 (by relup.sh)

[packages/openl2tp.git] / openl2tp.spec

diff --git a/openl2tp.spec b/openl2tp.spec
index 922921e9d5b8b58e8af1427379edd581f23785ab..ce0784e861bbd3f4c0fb5abf4ad054d3c186d974 100644 (file)
--- a/openl2tp.spec
+++ b/openl2tp.spec
@@ -2,15 +2,17 @@
 Summary:       An L2TP client/server, designed for VPN use
 Name:          openl2tp
 Version:       1.8
-Release:       2
+Release:       6
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net//openl2tp/%{name}-%{version}.tar.gz
 # Source0-md5: e3d08dedfb9e6a9a1e24f6766f6dadd0
 Source1:       %{name}d.init
 Source2:       %{name}d.sysconfig
+Source3:       %{name}.tmpfiles
 Patch0:                %{name}-no_Werror.patch
 Patch1:                %{name}-setkey.patch
+Patch2:                no-hardcoded-libdir.patch
 URL:           http://www.openl2tp.org/
 BuildRequires: bison
 BuildRequires: flex
@@ -54,18 +56,26 @@ or applications that use the OpenL2TP APIs.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-%{__make} CFLAGS.optimize="%{rpmcflags}"
+%{__make} -j1 \
+       CFLAGS.optimize="%{rpmcflags}" \
+       SYS_LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/sysconfig,/var/run/%{name}}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/sysconfig,/var/run/%{name}} \
+       $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       SYS_LIBDIR=%{_libdir} \
+       DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/openl2tpd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/openl2tpd
+install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
 touch $RPM_BUILD_ROOT%{_sysconfdir}/openl2tpd.conf
 
 %clean
@@ -90,6 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/openl2tpd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openl2tpd.conf
 %dir /var/run/%{name}
+/usr/lib/tmpfiles.d/%{name}.conf
 
 %files devel
 %defattr(644,root,root,755)