Update RPM spec file for 1.3.0

changelog

@@ -1,5 +1,47 @@
 lemonldap-ng (1.3.0) stable; urgency=low
 
+lemonldap-ng (1.2.2) stable; urgency=low
+
+    * [LEMONLDAP-436] - LDAP Search error when authenticating and identifying
+      on two LDAP (AD) with Multi modules
+    * [LEMONLDAP-490] - bad error log when user sends wrong login
+    * [LEMONLDAP-497] - CDA not working
+    * [LEMONLDAP-498] - DBI config storage does not use transactions
+    * [LEMONLDAP-506] - When working with 2 LDAP in Multi Mode, LDAP connexion
+      not reinitialized on second LDAP if user not found in first LDAP
+    * [LEMONLDAP-509] - regex for ldapServer on storing in Manager is too
+      string/wrong
+    * [LEMONLDAP-510] - javascript: $('...').attr('checked')==true never neems
+      to evaluate to TRUE
+    * [LEMONLDAP-515] - Parameter portalRequireOldPassword not checked in DBI
+    * [LEMONLDAP-516] - date popup in notification manager
+    * [LEMONLDAP-517] - typo in cookie name in portal WSDL
+    * [LEMONLDAP-518] - SAML session purge
+    * [LEMONLDAP-519] - SOAP webservice getCookies() should work with Auth
+      Multi
+    * [LEMONLDAP-522] - Cross-domain authentication and http cookies
+    * [LEMONLDAP-523] - RelayState is not sent in SAML logout requests by POST
+      method
+    * [LEMONLDAP-527] - Error with CDA when redirecting to other domain with
+      lemon cookie as a get parameter
+    * [LEMONLDAP-528] - With CDA, even if service url is https, cookie secure
+      flag is not set for the second domain
+    * [LEMONLDAP-529] - getDisplayType not well called in Multi backend
+    * [LEMONLDAP-530] - on androïd device, accept language misunderstood
+    * [LEMONLDAP-491] - Don't import all functions of POSIX
+    * [LEMONLDAP-494] - Lemonldap::NG::Portal::_DBI::hash_password and wrong
+      log type
+    * [LEMONLDAP-501] - All sessions browsed at SAML authentication
+    * [LEMONLDAP-505] - Make portal W3C compliant for html validation
+    * [LEMONLDAP-507] - It's better to "warn" the user when we create a fake
+      jail
+    * [LEMONLDAP-508] - Add armel architecture for debian repository
+    * [LEMONLDAP-514] - Enable notifications by default
+    * [LEMONLDAP-521] - arguments of custom functions
+    * [LEMONLDAP-249] - Manage apply key with the manager
+    * [LEMONLDAP-511] - A new SOAP webservice for deleting notifications
+    * [LEMONLDAP-504] - CLONE - Verify that oldPassword is not empty
+
 lemonldap-ng (1.2.1) stable; urgency=low
 
     * [LEMONLDAP-479] - LDAP groups are not stored in the session anymore

rpm/lemonldap-ng.spec

@@ -10,8 +10,11 @@
 # Variables
 #==============================================================================
 
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+
 %define real_name lemonldap-ng
-%define real_version 1.2.2
+%define real_version 1.3.0
 %define cpan_common_version  %{real_version}
 %define cpan_handler_version %{real_version}
 %define cpan_manager_version %{real_version}
@@ -84,7 +87,7 @@ BuildRequires:  perl(Class::Inspector)
 BuildRequires:  perl(Test::MockObject)
 BuildRequires:  perl(Clone)
 %else
-BuildRequires:  perl-Regexp-Assemble, perl-Cache-Cache, perl-Apache-Session, perl-Net-LDAP, perl-CGI-Session, perl-IO-String, perl-MIME-Lite, perl-SOAP-Lite, perl-XML-Simple, perl-XML-LibXSLT, perl-String-Random, perl-Email-Date-Format, perl-Crypt-Rijndael, perl-HTML-Template, perl-JSON, perl-Config-IniFiles, perl-Crypt-OpenSSL-RSA, perl-Crypt-OpenSSL-X509, perl-Class-Inspector, perl-Test-MockObject, perl-Clone
+BuildRequires:  perl-Regexp-Assemble, perl-Cache-Cache, perl-Apache-Session, perl-LDAP, perl-CGI-Session, perl-IO-String, perl-MIME-Lite, perl-SOAP-Lite, perl-XML-Simple, perl-XML-LibXSLT, perl-String-Random, perl-Email-Date-Format, perl-Crypt-Rijndael, perl-HTML-Template, perl-JSON, perl-Config-IniFiles, perl-Crypt-OpenSSL-RSA, perl-Crypt-OpenSSL-X509, perl-Class-Inspector, perl-Test-MockObject, perl-Clone
 %endif
 
 %if 0%{?rhl}%{?rhel}%{?fedora}
@@ -268,17 +271,40 @@ This package installs the authentication portal.
 # Source preparation
 #==============================================================================
 %prep
-%setup -q -n %{real_name}-%{real_version}.tar.gz
+%setup -n %{real_name}-%{real_version} -q
+
+# Remove unwanted provides/requires
+# We remove Lemonldap::NG requires because the requires are set in the header
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+sed -e '/perl(My::.*)/d'
+EOF
+
+%define __perl_provides %{_builddir}/%{name}-%{real_version}/%{name}-prov
+chmod +x %{__perl_provides}
+
+
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+sed -e '/perl(lasso)/d' |\
+sed -e '/perl(Net::OpenID::Server)/d' |\
+sed -e '/perl(AuthCAS)/d'
+EOF
+
+%define __perl_requires %{_builddir}/%{name}-%{real_version}/%{name}-req
+chmod +x %{__perl_requires}
 
 #==============================================================================
 # Building
 #==============================================================================
 %build
-%{__make} configure STORAGECONFFILE=%{lm_storagefile} PERLOPTIONS="INSTALLDIRS=vendor"
+%{__make} %{?_smp_mflags} configure STORAGECONFFILE=%{lm_storagefile} PERLOPTIONS="INSTALLDIRS=vendor"
-%{__make} 
+%{__make} %{?_smp_mflags}
 
-# run Test
+# Run Tests
-%{__make} test
+%{__make} %{?_smp_mflags} test
 
 #==============================================================================
 # Installation
@@ -286,7 +312,7 @@ This package installs the authentication portal.
 %install
 rm -rf %{buildroot}
 
-%{__make} install \
+%{__make} %{?_smp_mflags} install \
 	DESTDIR=%{buildroot} \
 	PREFIX=%{lm_prefix} \
 	BINDIR=%{lm_sharedir}/bin \
@@ -353,11 +379,16 @@ fi
 if [ $1 -gt 1 ] ; then
 	if [ -e %{lm_confdir}/storage.conf -o -e %{lm_confdir}/apply.conf -o -e %{lm_confdir}/apps-list.xml ] ; then
 		# Run migration script
-		%{lm_sharedir}/bin/lmMigrateConfFiles2ini &> /dev/null || :
+		%{lm_sharedir}/bin/lmMigrateConfFiles2ini 2>&1 > /dev/null || :
 		# Fix ownership
 		chgrp %{lm_apachegroup} %{lm_storagefile} || :
 	fi
 fi
+# Set editor alternatives if it does not exist
+update-alternatives --display editor > /dev/null 2>&1
+if [ $? -ne 0 ] ; then
+        update-alternatives --install /usr/bin/editor editor /usr/bin/vim 1
+fi
 
 #==============================================================================
 # Pre uninstallation
@@ -366,14 +397,14 @@ fi
 # Package removal
 if [ $1 -eq 0 ] ; then
 	# Remove symlink in Apache configuration
-	rm -f %{apache_confdir}/z-lemonldap-ng-handler.conf &> /dev/null || :
+	rm -f %{apache_confdir}/z-lemonldap-ng-handler.conf 2>&1 > /dev/null || :
-	rm -f %{apache_confdir}/z-lemonldap-ng-manager.conf &> /dev/null || :
+	rm -f %{apache_confdir}/z-lemonldap-ng-manager.conf 2>&1 > /dev/null || :
-	rm -f %{apache_confdir}/z-lemonldap-ng-portal.conf &> /dev/null  || :
+	rm -f %{apache_confdir}/z-lemonldap-ng-portal.conf 2>&1 > /dev/null  || :
 fi
 # Upgrade from previous version
 if [ $1 -eq 1 ] ; then
 	# Remove old symlink in Apache configuration
-	rm -f %{apache_confdir}/z-lemonldap-ng.conf &> /dev/null || :
+	rm -f %{apache_confdir}/z-lemonldap-ng.conf 2>&1 > /dev/null || :
 fi
 
 %clean
@@ -476,9 +507,10 @@ rm -rf %{buildroot}
 # Changelog
 #==============================================================================
 %changelog
-* Mon Jul 16 2012 Sandro Cazzaniga <cazzaniga.sandro@gmail.com> - 1.2.1-1
+* Mon Sep 17 2012 Clement Oudot <clem.oudot@gmail.com> - 1.2.2-1
+- Update to 1.2.2
+* Fri Jul 05 2012 Clement Oudot <clem.oudot@gmail.com> - 1.2.1-1
 - Update to 1.2.1
-- Improve spec portability 
 * Sun Jun 17 2012 Clement Oudot <clem.oudot@gmail.com> - 1.2.0-1
 - Update to 1.2.0
 * Fri Oct 07 2011 Clement Oudot <clem.oudot@gmail.com> - 1.1.2-1