- added _soname_prov and journal_catalog_update macros

[packages/rpm-build-macros.git] / rpm-build-macros.spec

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 6a18bd18c7ebeea50c2e5619211adcc4d3ecda6f..70ef2208cc55150dd8cad4557a305f6f39e2ef5e 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,5 +1,5 @@
-%define                rpm_macros_rev  1.700
-%define                find_lang_rev   1.36
+%define                rpm_macros_rev  1.721
+%define                find_lang_rev   1.38
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
@@ -25,6 +25,8 @@ Conflicts:    coreutils < 6.9
 Conflicts:     gettext-devel < 0.11
 # tmpdir/_tmppath macros problems; optcppflags missing
 Conflicts:     rpm < 4.4.9-72
+# macros.d/kernel
+Conflicts:     rpm-build < 5.4.15-6
 # php-config --sysconfdir
 Conflicts:     php-devel < 4:5.2.0-3
 Conflicts:     php4-devel < 3:4.4.4-10
@@ -75,12 +77,12 @@ fi
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d
 
-cp -a rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
-cp -a rpm.macros.kernel $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/kernel
+cp -p rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
+cp -p rpm.macros.kernel $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/kernel
 
 install -p service_generator.sh $RPM_BUILD_ROOT%{_usrlibrpm}
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
-install -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}/dokuwiki-find-lang.sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT