X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-tld-macros.git;a=blobdiff_plain;f=rpm-tld-macros.spec;h=9649c7cf986de48d93f7365e6e329927893cd6e8;hp=01e81a2f738eac4cd518a3d521b534c105d0c9ce;hb=HEAD;hpb=2b77114d9deedab262c5ebc6d67dd142a5f83556

diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index 01e81a2..af906c2 100644
--- a/rpm-tld-macros.spec
+++ b/rpm-tld-macros.spec
@@ -1,12 +1,12 @@
-%define		rpm_macros_rev	2.001
-%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:	4
+Release:	1
 License:	GPL v2+
 Group:		Development/Building
 Source0:	macros.tld
@@ -50,14 +50,19 @@ Source51:	macros.webapp
 Source52:	macros.xmms
 Source53:	macros.xorg
 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
@@ -77,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
@@ -227,9 +231,14 @@ cp -p %{SOURCE51} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.webapp
 cp -p %{SOURCE52} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.xmms
 cp -p %{SOURCE53} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.xorg
 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
@@ -244,13 +253,16 @@ 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
 
+%{_usrlibrpm}/macros.d/macros.arch
 %{_usrlibrpm}/macros.d/macros.browser-plugins
 %{_usrlibrpm}/macros.d/macros.cacti
 %{_usrlibrpm}/macros.d/macros.emacs
 %{_usrlibrpm}/macros.d/macros.ghc
+%{_usrlibrpm}/macros.d/macros.go
 %{_usrlibrpm}/macros.d/macros.gstreamer
 %{_usrlibrpm}/macros.d/macros.java
 %{_usrlibrpm}/macros.d/macros.kernel
@@ -259,7 +271,9 @@ 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
 %{_usrlibrpm}/macros.d/macros.systemd
 %{_usrlibrpm}/macros.d/macros.tcl