--- rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec 2008/08/12 17:45:06 1.22 +++ rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec 2009/11/23 18:54:28 1.39 @@ -1,38 +1,26 @@ +# $Id: e-smith-base+ldap.spec,v 1.38 2009/11/06 12:34:12 snetram Exp $ + Summary: e-smith server and gateway - base module %define name e-smith-base+ldap Name: %{name} -%define version 4.19.1 -%define release 24 +%define version 5.0.0 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -Patch1: e-smith-base+ldap-4.19.1-ldap.patch -Patch2: e-smith-base-4.18.1-insertmode.patch -Patch3: e-smith-base+ldap-4.19.1-freebusy.patch -Patch4: e-smith-base-4.18.1-frames.patch -Patch5: e-smith-base+ldap-4.19.1-convert_ldap-init-accounts_to_template.patch -Patch6: e-smith-base+ldap-4.19.1-nss_policy-post_install-ssl_fix.patch -Patch7: e-smith-base-4.18.1-quitconsole.patch -Patch8: e-smith-base-4.18.1-freebusy.patch2 -Patch9: e-smith-base+ldap-4.19.1-ldap_fixes.patch -Patch10: e-smith-base+ldap-4.19.1-import_fixes.patch -Patch11: e-smith-base-4.18.1-dateManip.patch -Patch12: e-smith-base-4.18.1-ethernetlist.patch -Patch13: e-smith-base-4.18.1-add2general.patch -Patch14: e-smith-base+ldap-4.19.1-change_domain_name.patch -Patch15: e-smith-base+ldap-4.19.1-freebusy.patch2 -Patch16: e-smith-base+ldap-4.19.1-add2general.patch -Patch17: e-smith-base+ldap-4.19.1-get_raid_details_cciss.patch -Patch18: e-smith-base+ldap-4.19.1-merge_users_and_people.patch -Patch19: e-smith-base+ldap-4.19.1-2739schema.patch -Patch20: e-smith-base-4.18.1-PortFixesFromBase.patch -Patch21: e-smith-base-4.18.1-fixPASSWORD_VERIFY_NEW.patch -Patch22: e-smith-base-4.18.1-ip-down.race.patch +Patch1: e-smith-base+ldap-5.0.0-sys_accounts.patch +Patch2: e-smith-base+ldap-5.0.0-sambaRole.patch +Patch3: e-smith-base+ldap-5.0.0-smartd40.patch +Patch4: e-smith-base+ldap-5.0.0-usbRev70drive.patch +Patch5: e-smith-base+ldap-5.2.0-ftp_auth.patch +Patch6: e-smith-base+ldap-5.0.0-straysymlink.patch +Patch7: e-smith-base+ldap-5.0.0-adapter-translation-fixes.patch +Patch8: e-smith-base+ldap-5.0.0-FixLocale_External.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external -Requires: e-smith-lib >= 1.18.0-19 +Requires: e-smith-lib >= 2.0.0-2 Requires: server-manager-images, server-manager Requires: e-smith-formmagick >= 1.4.0-12 Requires: initscripts >= 6.67-1es17 @@ -68,9 +56,6 @@ Provides: e-smith-ldap = 4.12.0-9 Requires: nss_ldap Requires: e-smith-samba+ldap Requires: cpu -%if "%{?rhel}" == "5" -Obsoletes: perl-Data-UUID -%endif BuildRequires: perl, perl(Test::Inline) >= 0.12 BuildRequires: e-smith-devtools >= 1.13.1-03 BuildRequires: gettext @@ -85,6 +70,51 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Mon Nov 23 2009 Gavin Weight 5.0.0-9.sme +- Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 1189] + +* Fri Nov 6 2009 Jonathan Martens 5.0.0-8.sme +- Translate $ifName in console configuration pages [SME: 1189] + +* Sat Jun 6 2009 Shad L. Lords 5.0.0-7.sme +- Clean up stray symlinks in /lib/modules before depmod [SME: 5334] + +* Thu Mar 26 2009 Daniel B. 5.0.0-6.sme +- Set PersistentPasswd to off in proftpd [SME: 5103] + +* Sat Feb 14 2009 Jonathan Martens 5.0.0-5.sme +- Auto-mount USB REV70-drive as usbdisk [SME: 5006] + +* Sat Oct 25 2008 Stephen Noble 5.0.0-4.sme +- create service link for smartd [SME: 1445] + +* Mon Oct 13 2008 Shad L. Lords 5.0.0-3.sme +- Add patch to support multiple samba roles [SME: 4172] + +* Wed Oct 8 2008 Daniel B. 5.0.0-2.sme +- do not import some system accounts/group in LDAP [SME: 4643] + +* Tue Oct 7 2008 Shad L. Lords 5.0.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Tue Sep 23 2008 Stephen Noble 4.19.1-30 +- Add locale tags for email in review panel [SME: 4267] + +* Sat Sep 20 2008 Shad L. Lords 4.19.1-29 +- Correct gettext type during build process [SME: 570] + +* Mon Sep 15 2008 Shad L. Lords 4.19.1-28 +- Fix screen corruption in console [SME: 4155] + +* Sat Sep 13 2008 Shad L. Lords 4.19.1-27 +- Fix detection of xen instance against newer kernels [SME: 4555] + +* Thu Aug 28 2008 Jonathan Martens 4.19.1-26 +- Fixed warnings generated during build process [SME: 570] + +* Sun Aug 17 2008 Gavin Weight 4.19.1-25 +- Add gettext to creating backup file title for localization. [SME: 4467] + * Tue Aug 12 2008 Gavin Weight 4.19.1-24 - Fix race condition in VPN ip-down handling which could cause loss of LAN connectivity. [SME: 4405] @@ -125,10 +155,10 @@ e-smith server and gateway software - ba * Thu May 14 2008 Daniel B. 4.19.1-16 - Add calEntry in ldap-update so the attribute calFBURL is allowed and - ou=People can be updated + ou=People can be updated [SME: 4358] * Mon Apr 28 2008 Daniel B. 4.19.1-15 -- Fix run script when domain name has changed +- Fix run script when domain name has changed [SME: 4293] * Mon Apr 28 2008 Jonathan Martens 4.19.1-14 - Add common tags to e-smith-formmagick's general [SME: 4279] @@ -1184,29 +1214,13 @@ e-smith server and gateway software - ba %prep %setup %patch1 -p1 -%if "%{?rhel}" == "5" %patch2 -p1 -%endif %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1271,7 +1285,7 @@ ln -s /etc/rc.d/rc7.d root/etc/rc7.d mkdir -p root/etc/rc.d/rc1.d mkdir -p root/usr/share/locale/en_US/LC_MESSAGES -xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console +xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console mkdir -p root/etc/e-smith/locale # Make the fr-ca link in %pre to ease upgrades @@ -1316,7 +1330,6 @@ rm root/service/{syslog,klogd} mkdir -p root/etc/e-smith/events/local mkdir -p root/etc/e-smith/events/user-modify-admin mkdir -p root/home/e-smith/db -touch root/home/e-smith/db/configuration mkdir -p root/etc/e-smith/pam mkdir -p root/home/e-smith/ssl.key @@ -1328,8 +1341,6 @@ mkdir -p root/var/state/e-smith for file in %{dbfiles} do mkdir -p root/etc/e-smith/db/$file/{defaults,migrate,force} - # Create ghost file for rpm - touch root/home/e-smith/db/$file done mkdir -p root/etc/tcprules