- merged 2.030 from PLD, re-enabled PHP dependency generators

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

diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index 8f3b07a4e56e1d26e61716fbb64b66524beefad0..af906c277b715e93ef6c4729978132fe8b9cdcac 100644 (file)
--- a/rpm-tld-macros.spec
+++ b/rpm-tld-macros.spec
@@ -1,12 +1,12 @@
-%define                rpm_macros_rev  2.011
-%define                find_lang_rev   1.40
+%define                rpm_macros_rev  2.030
+%define                find_lang_rev   1.42
 # split into individual X_prov_ver if there is a reason to desync
 %define                prov_ver        4.15
 Summary:       TLD Linux RPM macros
 Summary(pl.UTF-8):     Makra RPM dla Linuksa TLD
 Name:          rpm-tld-macros
 Version:       %{rpm_macros_rev}
-Release:       7
+Release:       1
 License:       GPL v2+
 Group:         Development/Building
 Source0:       macros.tld
@@ -53,14 +53,16 @@ Source54:   macros.selinux
 Source55:      macros.rust
 Source56:      macros.arch
 Source57:      macros.go
+Source58:      macros.qt
 
 Source60:      macros.gstreamer
 Source61:      attr.gstreamer
 
 Source62:      kmod-deps.sh
+Source63:      attr.mono
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: sed >= 4.0
-Obsoletes:     rpm-macros
+Obsoletes:     rpm-macros < 1.254
 # rm: option `--interactive' doesn't allow an argument
 Conflicts:     coreutils < 6.9
 # tmpdir/_tmppath macros problems; optcppflags missing
@@ -80,12 +82,11 @@ Ten pakiet zawiera makra rpm-a dla Linuksa TLD.
 %package build
 Summary:       TLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa TLD
-Group:         Development/Building
 Requires:      %{name} = %{version}-%{release}
 Requires:      findutils >= 1:4.2.26
 Provides:      rpmbuild(find_lang) = %{find_lang_rev}
 Provides:      rpmbuild(macros) = %{rpm_macros_rev}
-Obsoletes:     rpm-build-macros
+Obsoletes:     rpm-build-macros < 1.745
 Conflicts:     gettext-devel < 0.11
 # macros.d/*
 Conflicts:     rpm-build < 4.5-90
@@ -233,9 +234,11 @@ cp -p %{SOURCE54} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.selinux
 cp -p %{SOURCE55} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.rust
 cp -p %{SOURCE56} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.arch
 cp -p %{SOURCE57} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.go
+cp -p %{SOURCE58} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.qt
 
 cp -p %{SOURCE60} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.gstreamer
 cp -p %{SOURCE61} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/gstreamer.attr
+cp -p %{SOURCE63} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/mono.attr
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -250,6 +253,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_usrlibrpm}/fileattrs/java.attr
 %{_usrlibrpm}/fileattrs/gstreamer.attr
 %{_usrlibrpm}/fileattrs/kernel.attr
+%{_usrlibrpm}/fileattrs/mono.attr
 %{_usrlibrpm}/fileattrs/php.attr
 %{_usrlibrpm}/fileattrs/ruby.attr
 
@@ -267,6 +271,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_usrlibrpm}/macros.d/macros.perl
 %{_usrlibrpm}/macros.d/macros.php
 %{_usrlibrpm}/macros.d/macros.python
+%{_usrlibrpm}/macros.d/macros.qt
 %{_usrlibrpm}/macros.d/macros.ruby
 %{_usrlibrpm}/macros.d/macros.rust
 %{_usrlibrpm}/macros.d/macros.selinux