diff --git a/openvpn-2.3-plugin-man.dif b/openvpn-2.3-plugin-man.dif index 56f9fdc..2808bfe 100644 --- a/openvpn-2.3-plugin-man.dif +++ b/openvpn-2.3-plugin-man.dif @@ -1,20 +1,20 @@ -Index: openvpn.8 -=================================================================== ---- doc/openvpn.8.orig -+++ doc/openvpn.8 -@@ -2563,11 +2563,10 @@ +--- doc/openvpn.8 ++++ doc/openvpn.8 2015/03/02 08:58:02 +@@ -2569,12 +2569,11 @@ plug-in modules, see the README file in + .B plugin folder of the OpenVPN source distribution. - If you are using an RPM install of OpenVPN, see +-If you are using an RPM install of OpenVPN, see -/usr/share/openvpn/plugin. The documentation is -in -.B doc -and the actual plugin modules are in -.B lib. -+@PLUGIN_DIR@. The actual plugin modules are in ++If you are using an RPM install of OpenVPN, the actual ++plugin modules are in +.B @PLUGIN_LIBDIR@ +and the documentation is in -+.B @PLUGIN_DOCDIR@. ++.B @PLUGIN_DOCDIR@/README.. Multiple plugin modules can be cascaded, and modules can be used in tandem with scripts. The modules will be called by diff --git a/openvpn.changes b/openvpn.changes index 7744561..fdeca40 100644 --- a/openvpn.changes +++ b/openvpn.changes @@ -3,6 +3,7 @@ Mon Mar 2 08:26:08 UTC 2015 - mt@suse.de - Fixed to use correct sha digest data length and in fips mode, use aes instead of the disallowed blowfish crypto (boo#914166). +- Fixed to provide actual plugin/doc dirs in openvpn(8) man page. ------------------------------------------------------------------- Mon Dec 1 19:37:29 UTC 2014 - mt@suse.de diff --git a/openvpn.spec b/openvpn.spec index 4ac033a..4bcb825 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -149,7 +149,7 @@ export LDFLAGS --enable-plugin-auth-pam \ --with-lzo-headers=%_includedir/lzo \ CFLAGS="$CFLAGS $(getconf LFS_CFLAGS) -fPIE $PLUGIN_DEFS" \ - LDFLAGS="$LDFLAGS -pie -lpam -rdynamic -Wl,-rpath,%{_libdir}/%{name}/plugin/lib" + LDFLAGS="$LDFLAGS -pie -lpam -rdynamic -Wl,-rpath,%{_libdir}/%{name}/plugins" make %install