- patch without previous (never commited) patch

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

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 595769198b0e8209f575be24b11335a143a9513d..f7ffc57dd61a70f0d9d4cf6f6c32cdcdeaf23870 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,5 +1,5 @@
-%define                rpm_macros_rev  1.567
-%define                find_lang_rev   1.32
+%define                rpm_macros_rev  1.647
+%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
@@ -12,7 +12,8 @@ Source1:      service_generator.sh
 Source2:       rpm-build.sh
 Source3:       rpm-find-lang
 Source4:       dokuwiki-find-lang.sh
-#Patch0:               %{name}-pydebuginfo.patch
+Patch0:                disable-systemd.patch
+#Patchx: %{name}-pydebuginfo.patch
 BuildRequires: rpm >= 4.4.9-56
 Requires:      findutils >= 1:4.2.26
 Provides:      rpmbuild(find_lang) = %{find_lang_rev}
@@ -26,6 +27,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
@@ -49,6 +52,7 @@ cp %{SOURCE0} .
 
 %if "%{pld_release}" == "ac"
 %{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
+%patch0 -p1
 %endif
 
 %build