[openvpn-auth-ldap] Minor spec file cleanups.

Matthias Saou thias at fedoraproject.org
Sat Aug 13 21:02:21 UTC 2011


commit c59231546790b3c4e25cac7315537a3e99de8c53
Author: Matthias Saou <matthias at saou.eu>
Date:   Sat Aug 13 20:43:00 2011 +0200

    Minor spec file cleanups.

 openvpn-auth-ldap.spec |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/openvpn-auth-ldap.spec b/openvpn-auth-ldap.spec
index f298f11..f70e59a 100644
--- a/openvpn-auth-ldap.spec
+++ b/openvpn-auth-ldap.spec
@@ -1,7 +1,7 @@
 Summary: OpenVPN plugin for LDAP authentication
 Name: openvpn-auth-ldap
 Version: 2.0.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://code.google.com/p/openvpn-auth-ldap/
@@ -29,30 +29,30 @@ LDAP for OpenVPN 2.x.
 %patch0 -p1 -b .top_builddir
 %patch1 -p1 -b .README
 # Fix plugin from the instructions in the included README
-%{__sed} -i 's|^plugin .*| plugin %{_libdir}/openvpn/plugin/lib/openvpn-auth-ldap.so "/etc/openvpn/auth/ldap.conf"|g' README
+sed -i 's|^plugin .*| plugin %{_libdir}/openvpn/plugin/lib/openvpn-auth-ldap.so "/etc/openvpn/auth/ldap.conf"|g' README
 # Install the one required OpenVPN plugin header
-%{__install} -p -m 0644 %{SOURCE1} .
+install -p -m 0644 %{SOURCE1} .
 
 
 %build
 %configure \
     --libdir=%{_libdir}/openvpn/plugin/lib \
     --with-openvpn="`pwd`"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 # Main plugin
-%{__mkdir_p} %{buildroot}%{_libdir}/openvpn/plugin/lib
-%{__make} install DESTDIR=%{buildroot}
+mkdir -p %{buildroot}%{_libdir}/openvpn/plugin/lib
+make install DESTDIR=%{buildroot}
 # Example config file
-%{__install} -D -p -m 0600 auth-ldap.conf \
+install -D -p -m 0600 auth-ldap.conf \
     %{buildroot}%{_sysconfdir}/openvpn/auth/ldap.conf
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 
 %files
@@ -64,28 +64,31 @@ LDAP for OpenVPN 2.x.
 
 
 %changelog
+* Sat Aug 13 2011 Matthias Saou <matthias at saou.eu> 2.0.3-8
+- Minor spec file cleanups.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Feb 26 2009 Matthias Saou <http://freshrpms.net/> 2.0.3-5
+* Thu Feb 26 2009 Matthias Saou <matthias at saou.eu> 2.0.3-5
 - Update URL and Source locations.
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 2.0.3-3
+* Sun Feb  3 2008 Matthias Saou <matthias at saou.eu> 2.0.3-3
 - No longer use the full openvpn sources for the build, as only the
   openvpn-plugin.h file is required, so just include it alone.
 - Fix check to check-devel build requirement (it needs the header).
 
-* Thu Jun 21 2007 Matthias Saou <http://freshrpms.net/> 2.0.3-2
+* Thu Jun 21 2007 Matthias Saou <matthias at saou.eu> 2.0.3-2
 - Patch and change README to remove build instructions and have the proper
   line to be added to openvpn's configuration.
 - Move config file to a sub-dir since it gets picked up by openvpn otherwise.
 
-* Wed Jun 20 2007 Matthias Saou <http://freshrpms.net/> 2.0.3-1
+* Wed Jun 20 2007 Matthias Saou <matthias at saou.eu> 2.0.3-1
 - Initial RPM release.
 


More information about the scm-commits mailing list