- moved _smp_mflags here

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 3262eb573cc83fc648ec2db2ad3681aac22e075e..2318731e39b568ac0ef3f87d70823c6e8a32427b 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -69,6 +69,7 @@ Source15:     %{name}-macros.java
 Source16:      %{name}-java-requires
 # http://svn.pld-linux.org/banner.sh/
 Source17:      banner.sh
+Source18:      %{name}-pld.macros
 Patch0:                %{name}-pl.po.patch
 
 Patch3:                %{name}-rpmpopt.patch
@@ -85,7 +86,6 @@ Patch16:      %{name}-php-deps.patch
 
 Patch18:       %{name}-perl_req.patch
 
-Patch22:       %{name}-provides-dont-obsolete.patch
 Patch23:       %{name}-pkgconfigdeps.patch
 
 Patch25:       %{name}-rpm2cpio-payload.patch
@@ -105,8 +105,6 @@ Patch42:    %{name}-old-fileconflicts-behaviour.patch
 Patch46:       %{name}-mono.patch
 Patch47:       %{name}-javadeps.patch
 
-Patch50:       %{name}-macros.patch
-
 Patch52:       %{name}-morearchs.patch
 
 Patch55:       %{name}-truncate-cvslog.patch
@@ -616,8 +614,6 @@ sed -i -e 's#${prefix}/lib/python@WITH_PYTHON_VERSION@#@WITH_PYTHON_LIBDIR@#g' p
 #%patch14 -p1
 %patch16 -p1
 %patch18 -p1
-sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
-#cp -f platform.in macros.pld.in # what for?
 echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
 echo '%%define __perl_requires %%{__perl} /usr/lib/rpm/perl.req' >> macros.perl
 echo '# obsoleted file' > macros.python
@@ -629,30 +625,26 @@ install %{SOURCE5} scripts/find-lang.sh
 install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
-# CHECK ME. REPLACE WITH MACRO %_upgrade_tag name
-#%patch22 -p1
 %patch23 -p1
 %patch25 -p1
-# CHECK ME, possibly drop since we don't support i386 anymore
-# %patch26 -p1
+%ifarch i386
+# disable TSC
+%patch26 -p1
+%endif
 %patch27 -p1
 # CHECK ME
 #%patch31 -p1
 %patch32 -p1
 %patch34 -p1
 %patch35 -p0
-# CHECK ME
-#%patch36 -p1
+%patch36 -p1
 %patch37 -p1
 # CHECK ME
 #%patch41 -p1
 %patch42 -p1
 # CHECK ME, PROBABLY WILL NEED TO HANLE IN OTHER WAY since rpmfcSCRIPT already handles mono
 #%patch46 -p1
-# CHECK ME
-#%patch47 -p1
-# CHECK ME, replace part by --with-path-macros
-#%patch50 -p1
+%patch47 -p1
 # OLD COMMENTED OUT
 #%patch52 -p1
 %patch55 -p1
@@ -715,6 +707,7 @@ awk -f %{SOURCE6} %{SOURCE1}
        --with-pcre=external \
        --with-keyutils=none \
        --without-path-versioned \
+       --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/macros.*:%{_sysconfdir}/macros:%{_sysconfdir}/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
        --with-bugreport="http://bugs.pld-linux.org/"
 
 %{__make} \
@@ -798,6 +791,7 @@ install macros.python       $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python
 install macros.php     $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php
 install macros.mono    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono
 install %{SOURCE15}    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
+install %{SOURCE18}    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.pld
 
 install %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
@@ -986,6 +980,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/macros
+%{_rpmlibdir}/macros.pld
 
 %files base
 %defattr(644,root,root,755)