Browse Source

new upstream release.

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2261 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 13 years ago
parent
commit
5e1ac71469
1 changed files with 36 additions and 23 deletions
  1. 36 23
      s/sendmail/sendmail-vl.spec

+ 36 - 23
s/sendmail/sendmail-vl.spec

@@ -9,7 +9,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Summary(ja): 広く使用されているメール配送エージェント (MTA)。
 Name: sendmail
-Version: 8.14.2
+Version: 8.14.4
 Release: 1%{?_dist_release}
 URL: http://www.sendmail.org/
 License: Sendmail
@@ -40,23 +40,23 @@ BuildRequires: db4-devel, tcp_wrappers
 #Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
 #Provides: %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz
 #Provides: %{_mandir}/man1/newaliases.1.gz %{_mandir}/man5/aliases.5.gz
-Prereq: /sbin/chkconfig /usr/sbin/useradd /bin/mktemp fileutils gawk sed sh-utils
+Requires(pre): /sbin/chkconfig /usr/sbin/useradd /bin/mktemp fileutils gawk sed sh-utils
 Conflicts: postfix exim
 Requires: procmail, bash >= 2.0
 
 %if %{with_ldap}
 BuildRequires: openldap-devel openssl-devel
-Prereq: openldap openssl
+Requires(pre): openldap openssl
 %endif
 
 %if %{with_sasl} || %{with_sasl2}
 BuildRequires: cyrus-sasl-devel openssl-devel
-Prereq: cyrus-sasl openssl
+Requires(pre): cyrus-sasl openssl
 %endif
 
 %if %{with_tls}
 BuildRequires: openssl-devel
-Prereq: openssl
+Requires(pre): openssl
 %endif
 
 Vendor: Project Vine
@@ -142,9 +142,16 @@ your sendmail.cf file.
 %patch6 -p1 -b .cyrus
 #%patch7 -p1 -b .cataddr
 
+perl -pi -e 's|/usr/share/sendmail-cf/m4|../m4|' ./cf/cf/submit.mc
+
 %build
 cp %{SOURCE2} devtools/Site/site.config.m4
 
+cat >> devtools/Site/site.config.m4 << EOF
+APPENDDEF(\`confENVDEF', \`-DNEWDB')dnl
+APPENDDEF(\`confLIBS', \`-ldb')dnl
+EOF
+
 %if %{with_ldap}
 cat >> devtools/Site/site.config.m4 << EOF
 APPENDDEF(\`confMAPDEF', \`-DLDAPMAP')dnl
@@ -189,7 +196,7 @@ mkdir -p usr/bin usr/include/libmilter usr/lib .%{_mandir}/man{1,5,8}
 mkdir -p usr/sbin var/log var/spool .%{_datadir}/sendmail-cf
 cd -
 
-OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
+OBJDIR=obj.$(uname -s).$(uname -r).$(uname -m)
 nameuser=`id -nu`
 namegroup=`id -ng`
 
@@ -252,12 +259,13 @@ echo "# local-host-names - include all aliases for your machine here." \
 echo "# apache, mailman, majordomo, uucp, are good candidates" ) \
     > $RPM_BUILD_ROOT/etc/mail/trusted-users
 
-touch $RPM_BUILD_ROOT/rootfile
-root=..
-while [ ! -r $RPM_BUILD_ROOT%{_libdir}/${root}/rootfile ]; do
-    root=${root}/..
-done
+#touch $RPM_BUILD_ROOT/rootfile
+#root=..
+#while [ ! -r $RPM_BUILD_ROOT%{_libdir}/${root}/rootfile ]; do
+#    root=${root}/..
+#done
 #ln -sf ${root}%{_sbindir}/sendmail $RPM_BUILD_ROOT%{_libdir}/sendmail
+install -m 755 -d $RPM_BUILD_ROOT%{_libdir}
 ln -sf ../sbin/sendmail $RPM_BUILD_ROOT%{_libdir}/sendmail
 install -d -m 775 $RPM_BUILD_ROOT/var/spool/mqueue
 install -d -m 755 $RPM_BUILD_ROOT/var/spool/clientmqueue
@@ -398,18 +406,18 @@ exit 0
 
 %files
 %defattr(-,root,root)
-/usr/bin/hoststat
-/usr/bin/makemap
-/usr/bin/purgestat
-/usr/sbin/mailstats
-/usr/sbin/makemap
-/usr/sbin/praliases
-%attr(2755,root,smmsp)/usr/sbin/sendmail
-/usr/bin/rmail
-/usr/bin/newaliases
-/usr/bin/mailq
-/usr/sbin/smrsh
-/usr/lib/sendmail
+%{_bindir}/hoststat
+%{_bindir}/makemap
+%{_bindir}/purgestat
+%{_sbindir}/mailstats
+%{_sbindir}/makemap
+%{_sbindir}/praliases
+%attr(2755,root,smmsp) %{_sbindir}/sendmail
+%{_bindir}/rmail
+%{_bindir}/newaliases
+%{_bindir}/mailq
+%{_sbindir}/smrsh
+%{_libdir}/sendmail
 
 %{_mandir}/man8/rmail.8*
 %{_mandir}/man8/praliases.8*
@@ -476,6 +484,11 @@ exit 0
 %{_docdir}/sendmail
 
 %changelog
+* Tue Nov 16 2010 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.14.4-1
+- new upstream release.
+- fixed %%files for x86_64 architecture.
+- forced using db4.
+
 * Sat Jun 21 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 8.14.2-1
 - rebuilt against db4-4.6.21
 - new versioning policy with spec in UTF-8