X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=rpm-tld-macros.spec;h=4c239235e5e48d9040102bafd8580e9a042ee009;hb=refs%2Fheads%2Frpm.org-migrate;hp=9649c7cf986de48d93f7365e6e329927893cd6e8;hpb=a8b462c1f839b0f67d81b5f94047e6e0f50c67d4;p=packages%2Frpm-tld-macros.git

diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index 9649c7c..4c23923 100644
--- a/rpm-tld-macros.spec
+++ b/rpm-tld-macros.spec
@@ -1,5 +1,5 @@
-%define		rpm_macros_rev	2.013
-%define		find_lang_rev	1.40
+%define		rpm_macros_rev	2.029
+%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
@@ -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
@@ -85,7 +87,7 @@ 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
@@ -185,6 +187,8 @@ fi
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_usrlibrpm}/{fileattrs,macros.d,tld}
 
+install -d $RPM_BUILD_ROOT{/lib/systemd,/usr/lib/{systemd,binfmt.d,environment.d,modules-load.d,sysctl.d,sysusers.d,tmpfiles.d},/etc/{binfmt.d,modules-load.d,systemd,tmpfiles.d},/usr/share/user-tmpfiles.d}
+
 cp -p macros.tld $RPM_BUILD_ROOT%{_usrlibrpm}/tld/macros
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_usrlibrpm}/tld/rpmrc
 
@@ -233,26 +237,32 @@ 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
 
 %files
 %defattr(644,root,root,755)
+%dir %{_usrlibrpm}/tld
 %{_usrlibrpm}/tld/macros
 %{_usrlibrpm}/tld/rpmrc
 
 %files build
 %defattr(644,root,root,755)
+%dir %{_usrlibrpm}/fileattrs
 %{_usrlibrpm}/fileattrs/java.attr
 %{_usrlibrpm}/fileattrs/gstreamer.attr
 %{_usrlibrpm}/fileattrs/kernel.attr
+%{_usrlibrpm}/fileattrs/mono.attr
 %{_usrlibrpm}/fileattrs/php.attr
 %{_usrlibrpm}/fileattrs/ruby.attr
 
+%dir %{_usrlibrpm}/macros.d
 %{_usrlibrpm}/macros.d/macros.arch
 %{_usrlibrpm}/macros.d/macros.browser-plugins
 %{_usrlibrpm}/macros.d/macros.cacti
@@ -267,6 +277,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