X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-build-macros.spec;h=46d69953574ab0ac3d703ac6b4c504d45d8bce11;hb=afdaeaf43e7024d92a5234e9f6c54bc6b7860e14;hp=75ef1d007e46913a6e3cff456eafe882559ef048;hpb=0d125bec4671be5d4781d4d56b9978391e990b05;p=packages%2Frpm-build-macros.git diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index 75ef1d0..46d6995 100644 --- a/rpm-build-macros.spec +++ b/rpm-build-macros.spec @@ -1,5 +1,5 @@ -%define rpm_macros_rev 1.533 -%define find_lang_rev 1.32 +%define rpm_macros_rev 1.623 +%define find_lang_rev 1.35 Summary: PLD Linux RPM build macros Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD Name: rpm-build-macros @@ -26,6 +26,8 @@ Conflicts: rpm < 4.4.9-72 # php-config --sysconfdir Conflicts: php-devel < 4:5.2.0-3 Conflicts: php4-devel < 3:4.4.4-10 +# sysconfig module with proper 'purelib' path +Conflicts: python3 < 1:3.2.1-3 %if "%{pld_release}" != "ac" # libtool --install Conflicts: libtool < 2:2.2 @@ -66,11 +68,11 @@ fi %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_usrlibrpm},/etc/shrc.d} -cp rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build -install %{SOURCE1} $RPM_BUILD_ROOT%{_usrlibrpm}/service_generator.sh -install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh -install %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh -install %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm} +cp -a rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build +install -p %{SOURCE1} $RPM_BUILD_ROOT%{_usrlibrpm}/service_generator.sh +install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh +install -p %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh +install -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm} %clean rm -rf $RPM_BUILD_ROOT