Author: glen Date: Thu Jul 27 10:46:37 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.310 macros instead of fixperms hack
---- Files affected: SPECS: perl.spec (1.332 -> 1.333) , sendmail.spec (1.180 -> 1.181) ---- Diffs: ================================================================ Index: SPECS/perl.spec diff -u SPECS/perl.spec:1.332 SPECS/perl.spec:1.333 --- SPECS/perl.spec:1.332 Sun Jul 23 20:55:44 2006 +++ SPECS/perl.spec Thu Jul 27 12:46:32 2006 @@ -61,7 +61,7 @@ # Source0-md5: a377c0c67ab43fd96eeec29ce19e8382 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: de47d7893f49ad7f41ba69c78511c0db -Source2: perl.prov +Source2: %{name}.prov Patch0: %{name}_581-noroot_install.patch Patch1: %{name}_581-INC.patch Patch3: %{name}_580-errno_h-parsing.patch @@ -77,6 +77,7 @@ URL: http://dev.perl.org/perl5/ # required for proper Provides generation (older are not supported by spec) BuildRequires: rpm-build >= 4.3-0.20040107.4 +BuildRequires: rpmbuild(macros) >= 1.310 %{?with_gdbm:BuildRequires: gdbm-devel} Requires: %{name}-base = %{epoch}:%{version}-%{release} Requires: %{name}-modules = %{epoch}:%{version}-%{release} @@ -270,6 +271,7 @@ Summary: Base Perl components for a minimal installation Summary(pl): Podstawowe składniki potrzebne do minimalnej instalacji Perla Group: Development/Languages/Perl +Provides: perl(largefiles) Provides: perl-File-Compare = 1.1003 Provides: perl-File-Spec = 3.12 Provides: perl-File-Temp = 0.16 @@ -277,7 +279,6 @@ Provides: perl-Safe = 2.12 Provides: perl-Socket = 1.78 Provides: perl-Tie-File = 0.97 -Provides: perl(largefiles) # broken, unsupported modules Obsoletes: perl-SOAP Obsoletes: perl-Sort-PolySort @@ -354,8 +355,8 @@ Group: Documentation %description doc-reference -Reference documentation for the Practical Extraction and Report Language -and it's interpreter in the man(1) format. +Reference documentation for the Practical Extraction and Report +Language and it's interpreter in the man(1) format. %description doc-reference -l pl Dokumentacja referencyjna w formacie man do języka Perl (Practical @@ -842,9 +843,6 @@ mv $RPM_BUILD_ROOT%{perl_privlib}/auto/POSIX/SigAction \ $RPM_BUILD_ROOT%{perl_archlib}/auto/POSIX -## for %%__spec_install_post_strip -%{_fixperms} $RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT @@ -1427,6 +1425,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.333 2006/07/27 10:46:32 glen +- 1.310 macros instead of fixperms hack + Revision 1.332 2006/07/23 18:55:44 qboosh - use .so instead of symlink for manual ================================================================ Index: SPECS/sendmail.spec diff -u SPECS/sendmail.spec:1.180 SPECS/sendmail.spec:1.181 --- SPECS/sendmail.spec:1.180 Wed Jun 14 22:19:48 2006 +++ SPECS/sendmail.spec Thu Jul 27 12:46:32 2006 @@ -58,7 +58,7 @@ %{?with_ldap:BuildRequires: openldap-devel >= 2.3.0} %{?with_tls:BuildRequires: openssl-devel >= 0.9.7d} %{?with_pgsql:BuildRequires: postgresql-devel} -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: rpmbuild(macros) >= 1.310 Requires(post): awk Requires(post): textutils Requires(post,preun): /sbin/chkconfig @@ -198,7 +198,7 @@ echo "define(\`confCC', \`%{__cc}')" >> config.m4 echo "define(\`confOPTIMIZE', \`%{rpmcflags} -DUSE_VENDOR_CF_PATH=1 -DNETINET6')" >> config.m4 echo "APPENDDEF(\`confINCDIRS', \`-I/usr/include/sasl')" >> config.m4 -echo "define(\`confLIBSEARCHPATH', \`/%{_lib} /usr/%{_lib}')" >> config.m4 +echo "define(\`confLIBSEARCHPATH', \`/%{_lib} %{_prefix}/%{_lib}')" >> config.m4 echo "define(\`confLIBSEARCH', \`db resolv')" >> config.m4 %if 0%{!?debug:1} echo "define(\`confLDOPTS', \`-s')" >> config.m4 @@ -290,11 +290,11 @@ > $RPM_BUILD_ROOT%{_sysconfdir}/local-host-names #"vim ruuls -ln -sf /usr/sbin/sendmail $RPM_BUILD_ROOT%{_prefix}/lib/sendmail +ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_prefix}/lib/sendmail # dangling symlinks -for f in hoststat mailq newaliases purgestat ; do - ln -sf /usr/sbin/sendmail $RPM_BUILD_ROOT%{_bindir}/${f} +for f in hoststat mailq newaliases purgestat; do + ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/${f} done for map in virtusertable access domaintable mailertable; do @@ -318,9 +318,6 @@ install %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/domaintable install %{SOURCE14} $RPM_BUILD_ROOT/etc/monit/ -# make rpm strip possible -%{_fixperms} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} - mv -f smrsh/README README.smrsh mv -f cf/README README.cf mv -f doc/op/op.me . @@ -480,6 +477,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.181 2006/07/27 10:46:32 glen +- 1.310 macros instead of fixperms hack + Revision 1.180 2006/06/14 20:19:48 glen - 8.13.7 (CVE-2006-1173, VU#146718 according to SuSE SA) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/perl.spec?r1=1.332&r2=1.333&f=u http://cvs.pld-linux.org/SPECS/sendmail.spec?r1=1.180&r2=1.181&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
