diff --git a/lam-packaging/RPM/ldap-account-manager.spec b/lam-packaging/RPM/ldap-account-manager.spec index eb0e8c38..57e727dd 100644 --- a/lam-packaging/RPM/ldap-account-manager.spec +++ b/lam-packaging/RPM/ldap-account-manager.spec @@ -73,7 +73,7 @@ mv $RPM_BUILD_ROOT/usr/share/%{lam_dir}/tmp $RPM_BUILD_ROOT/var/lib/%{lam_dir} ln -s $RPM_BUILD_ROOT/var/lib/%{lam_dir}/tmp $RPM_BUILD_ROOT/usr/share/%{lam_dir}/tmp mv $RPM_BUILD_ROOT/usr/share/%{lam_dir}/sess $RPM_BUILD_ROOT/var/lib/%{lam_dir} ln -s $RPM_BUILD_ROOT/var/lib/%{lam_dir}/sess $RPM_BUILD_ROOT/usr/share/%{lam_dir}/sess -cp lam-packaging/RPM/lam.apache.conf %{httpd_confdir}/ +cp lam.apache.conf %{httpd_confdir}/ %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT diff --git a/lam-packaging/buildPackages b/lam-packaging/buildPackages index 10f6ee20..b05dbf3d 100755 --- a/lam-packaging/buildPackages +++ b/lam-packaging/buildPackages @@ -119,24 +119,28 @@ mkdir LAMPro/RPM # Fedora RPM cp ldap-account-manager-$VERSION.tar.gz ~/rpmbuild/SOURCES +cp lam-packaging/RPM/lam.apache.conf ~/rpmbuild/SOURCES rpmbuild --sign --clean --rmsource -bb lam-packaging/RPM/ldap-account-manager-fedora.spec mv ~/rpmbuild/RPMS/noarch/ldap-account-manager*-$VERSION-*1.noarch.rpm RPM/ # Fedora RPM for LAM Pro cd LAMPro cp ldap-account-manager-$VERSION.tar.gz ~/rpmbuild/SOURCES/ldap-account-manager-$VERSION.tar.gz +cp lam-packaging/RPM/lam.apache.conf ~/rpmbuild/SOURCES rpmbuild --sign --clean --rmsource -bb ../lam-packaging/RPM/ldap-account-manager-fedora.spec mv ~/rpmbuild/RPMS/noarch/ldap-account-manager*-$VERSION-*1.noarch.rpm RPM/ cd .. # Suse RPM cp ldap-account-manager-$VERSION.tar.gz ~/rpmbuild/SOURCES +cp lam-packaging/RPM/lam.apache.conf ~/rpmbuild/SOURCES rpmbuild --sign --clean --rmsource -bb lam-packaging/RPM/ldap-account-manager-suse.spec mv ~/rpmbuild/RPMS/noarch/ldap-account-manager*-$VERSION-*1.noarch.rpm RPM/ # Suse RPM for LAM Pro cd LAMPro cp ldap-account-manager-$VERSION.tar.gz ~/rpmbuild/SOURCES/ldap-account-manager-$VERSION.tar.gz +cp lam-packaging/RPM/lam.apache.conf ~/rpmbuild/SOURCES rpmbuild --sign --clean --rmsource -bb ../lam-packaging/RPM/ldap-account-manager-suse.spec mv ~/rpmbuild/RPMS/noarch/ldap-account-manager*-$VERSION-*1.noarch.rpm RPM/ cd ..