X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-tld-macros.git;a=blobdiff_plain;f=rpm-tld-macros.spec;h=f08edbca4847878d0447091957c1d384cf516ed1;hp=63b54968646001dee66cad1302fc5773eda7bcd9;hb=9a710165b069622ace5c1c784494f2281db74256;hpb=41a8035cb2cd12eae13a5d6ed282559894274ed6

diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index 63b5496..f08edbc 100644
--- a/rpm-tld-macros.spec
+++ b/rpm-tld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.747
+%define		rpm_macros_rev	1.753
 %define		find_lang_rev	1.40
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15
@@ -6,7 +6,7 @@ Summary:	TLD Linux RPM macros
 Summary(pl.UTF-8):	Makra RPM dla Linuksa TLD
 Name:		rpm-tld-macros
 Version:	%{rpm_macros_rev}
-Release:	3
+Release:	1.1
 License:	GPL v2+
 Group:		Development/Building
 Source0:	macros.tld
@@ -15,21 +15,22 @@ Source3:	find-lang.sh
 Source4:	dokuwiki-find-lang.sh
 Source5:	macros.kernel
 Source6:	attr.kernel
+Source7:	rpmrc
 Source8:	rpm-compress-doc
 Source9:	rpm-find-spec-bcond
 
-Source10:	attr.ruby
-Source11:	macros.ruby
+Source10:	macros.ruby
+Source11:	attr.ruby
 Source12:	rubygems.rb
 Source13:	gem_helper.rb
 
-Source20:	attr.java
-Source21:	macros.java
+Source20:	macros.java
+Source21:	attr.java
 Source22:	rpm-java-requires
 Source23:	eclipse-feature.xslt
 
-Source30:	attr.php
-Source31:	macros.php
+Source30:	macros.php
+Source31:	attr.php
 Source32:	rpm-php-provides
 Source33:	rpm-php-requires
 Source34:	rpm-php-requires.php
@@ -48,12 +49,18 @@ Source50:	macros.upstart
 Source51:	macros.webapp
 Source52:	macros.xmms
 Source53:	macros.xorg
+Source54:	macros.selinux
 
-Source60:	rpm-mimetypedeps
-Source61:	macros.mimetype
+Source60:	macros.gstreamer
+Source61:	attr.gstreamer
 
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	sed >= 4.0
+Obsoletes:	rpm-macros
+# rm: option `--interactive' doesn't allow an argument
+Conflicts:	coreutils < 6.9
+# tmpdir/_tmppath macros problems; optcppflags missing
+Conflicts:	rpm < 4.4.9-72
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,16 +77,12 @@ Ten pakiet zawiera makra rpm-a dla Linuksa TLD.
 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-macros
-# rm: option `--interactive' doesn't allow an argument
-Conflicts:	coreutils < 6.9
 Conflicts:	gettext-devel < 0.11
-# tmpdir/_tmppath macros problems; optcppflags missing
-Conflicts:	rpm < 4.4.9-72
 # macros.d/*
 Conflicts:	rpm-build < 4.5-90
 # php-config --sysconfdir
@@ -176,27 +179,33 @@ fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_usrlibrpm}/{macros.d,tld}
+install -d $RPM_BUILD_ROOT%{_usrlibrpm}/{fileattrs,macros.d,tld}
+
+cp -p macros.tld $RPM_BUILD_ROOT%{_usrlibrpm}/tld/macros
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_usrlibrpm}/tld/rpmrc
 
-cp -p macros.tld $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
 cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_usrlibrpm}/compress-doc
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_usrlibrpm}/find-spec-bcond
 
-cat %{SOURCE5} %{SOURCE6} >$RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.kernel
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.kernel
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/kernel.attr
 
-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}/dokuwiki-find-lang.sh
+cp -p service_generator.sh $RPM_BUILD_ROOT%{_usrlibrpm}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}/dokuwiki-find-lang.sh
 
-cat %{SOURCE11} %{SOURCE10} >$RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.ruby
-install -p %{SOURCE12} $RPM_BUILD_ROOT%{_usrlibrpm}/rubygems.rb
-install -p %{SOURCE13} $RPM_BUILD_ROOT%{_usrlibrpm}/gem_helper.rb
+cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.ruby
+cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/ruby.attr
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_usrlibrpm}/rubygems.rb
+cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_usrlibrpm}/gem_helper.rb
 
-cat %{SOURCE21} %{SOURCE20} >$RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.java
-install %{SOURCE22} $RPM_BUILD_ROOT%{_usrlibrpm}/java-find-requires
-install %{SOURCE23} $RPM_BUILD_ROOT%{_usrlibrpm}/eclipse-feature.xslt
+cp -p %{SOURCE20} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.java
+cp -p %{SOURCE21} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/java.attr
+cp -p %{SOURCE22} $RPM_BUILD_ROOT%{_usrlibrpm}/java-find-requires
+cp -p %{SOURCE23} $RPM_BUILD_ROOT%{_usrlibrpm}/eclipse-feature.xslt
 
-cat %{SOURCE31} %{SOURCE30} >$RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.php
+cp -p %{SOURCE30} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.php
+cp -p %{SOURCE31} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/php.attr
 cp -p %{SOURCE32} $RPM_BUILD_ROOT%{_usrlibrpm}/php.prov
 cp -p %{SOURCE33} $RPM_BUILD_ROOT%{_usrlibrpm}/php.req
 cp -p %{SOURCE34} $RPM_BUILD_ROOT%{_usrlibrpm}/php.req.php
@@ -215,41 +224,53 @@ cp -p %{SOURCE50} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.upstart
 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 %{SOURCE60} $RPM_BUILD_ROOT%{_usrlibrpm}/mimetypedeps.sh
-cp -p %{SOURCE61} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.mimetype
+cp -p %{SOURCE60} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.gstreamer
+cp -p %{SOURCE61} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/gstreamer.attr
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%files
+%defattr(644,root,root,755)
+%{_usrlibrpm}/tld/macros
+%{_usrlibrpm}/tld/rpmrc
+
 %files build
 %defattr(644,root,root,755)
-%{_usrlibrpm}/macros.build
+%{_usrlibrpm}/fileattrs/java.attr
+%{_usrlibrpm}/fileattrs/gstreamer.attr
+%{_usrlibrpm}/fileattrs/kernel.attr
+%{_usrlibrpm}/fileattrs/php.attr
+%{_usrlibrpm}/fileattrs/ruby.attr
+
 %{_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.gstreamer
 %{_usrlibrpm}/macros.d/macros.java
 %{_usrlibrpm}/macros.d/macros.kernel
-%{_usrlibrpm}/macros.d/macros.mimetype
 %{_usrlibrpm}/macros.d/macros.nagios
 %{_usrlibrpm}/macros.d/macros.openldap
 %{_usrlibrpm}/macros.d/macros.perl
 %{_usrlibrpm}/macros.d/macros.php
 %{_usrlibrpm}/macros.d/macros.python
 %{_usrlibrpm}/macros.d/macros.ruby
+%{_usrlibrpm}/macros.d/macros.selinux
 %{_usrlibrpm}/macros.d/macros.systemd
 %{_usrlibrpm}/macros.d/macros.tcl
 %{_usrlibrpm}/macros.d/macros.upstart
 %{_usrlibrpm}/macros.d/macros.webapp
 %{_usrlibrpm}/macros.d/macros.xmms
 %{_usrlibrpm}/macros.d/macros.xorg
-%attr(755,root,root) %{_usrlibrpm}/service_generator.sh
-%attr(755,root,root) %{_usrlibrpm}/find-lang.sh
-%attr(755,root,root) %{_usrlibrpm}/dokuwiki-find-lang.sh
+
 %attr(755,root,root) %{_usrlibrpm}/compress-doc
+%attr(755,root,root) %{_usrlibrpm}/dokuwiki-find-lang.sh
+%attr(755,root,root) %{_usrlibrpm}/find-lang.sh
 %attr(755,root,root) %{_usrlibrpm}/find-spec-bcond
-%attr(755,root,root) %{_usrlibrpm}/mimetypedeps.sh
+%attr(755,root,root) %{_usrlibrpm}/service_generator.sh
 
 %files rubyprov
 %defattr(644,root,root,755)