diff --git a/fileattrs/Makefile.am b/fileattrs/Makefile.am index 148d2ff0d7..9c55aa111e 100644 --- a/fileattrs/Makefile.am +++ b/fileattrs/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/rpm.am fattrsdir = $(rpmconfigdir)/fileattrs fattrs_DATA = \ - appdata.attr debuginfo.attr desktop.attr elf.attr font.attr libtool.attr \ + debuginfo.attr desktop.attr elf.attr font.attr libtool.attr metainfo.attr \ perl.attr perllib.attr pkgconfig.attr python.attr ocaml.attr script.attr \ mono.attr diff --git a/fileattrs/appdata.attr b/fileattrs/appdata.attr deleted file mode 100644 index 06fab9afbd..0000000000 --- a/fileattrs/appdata.attr +++ /dev/null @@ -1,2 +0,0 @@ -%__appdata_provides %{_rpmconfigdir}/appdata.prov -%__appdata_path ^%{_datadir}/appdata/.*\\.appdata\\.xml$ diff --git a/fileattrs/metainfo.attr b/fileattrs/metainfo.attr new file mode 100644 index 0000000000..f016d45f47 --- /dev/null +++ b/fileattrs/metainfo.attr @@ -0,0 +1,2 @@ +%__metainfo_provides %{_rpmconfigdir}/metainfo.prov +%__metainfo_path ^%{_datadir}/(appdata|metainfo)/.*\\.(appdata|metainfo)\\.xml$ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 9e360d0981..f204c51e1e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -19,12 +19,11 @@ EXTRA_DIST = \ find-requires.php find-provides.php \ mono-find-requires mono-find-provides \ ocaml-find-requires.sh ocaml-find-provides.sh \ - pkgconfigdeps.sh libtooldeps.sh appdata.prov \ + pkgconfigdeps.sh libtooldeps.sh metainfo.prov \ fontconfig.prov desktop-file.prov script.req \ macros.perl macros.php macros.python rpmconfig_SCRIPTS = \ - appdata.prov \ brp-compress brp-python-bytecompile brp-java-gcjcompile \ brp-strip brp-strip-comment-note brp-python-hardlink \ brp-strip-shared brp-strip-static-archive \ @@ -33,6 +32,7 @@ rpmconfig_SCRIPTS = \ debuginfo.prov \ find-lang.sh find-requires find-provides \ perl.prov perl.req pythondeps.sh pythondistdeps.py \ + metainfo.prov \ mono-find-requires mono-find-provides \ pkgconfigdeps.sh libtooldeps.sh \ ocaml-find-requires.sh ocaml-find-provides.sh \ diff --git a/scripts/appdata.prov b/scripts/appdata.prov deleted file mode 100755 index d1459c5ca1..0000000000 --- a/scripts/appdata.prov +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# Transform appdata xml file into RPM appdata(filename) provides -# -# Author: Michael Schroeder -# Based on other provides scripts from RPM - -OLD_IFS="$IFS" -while read instfile ; do - case "$instfile" in - *.appdata.xml) - echo "appdata()" - echo "appdata(${instfile##*/appdata/})" - ;; - esac -done -IFS=$OLD_IFS - diff --git a/scripts/metainfo.prov b/scripts/metainfo.prov new file mode 100755 index 0000000000..6d58d4777c --- /dev/null +++ b/scripts/metainfo.prov @@ -0,0 +1,23 @@ +#!/bin/sh +# +# Transform appdata/metainfo xml file into RPM metainfo(filename) provides +# +# Author: Michael Schroeder +# Modified by Neal Gompa to generate metainfo instead of appdata +# Based on other provides scripts from RPM + +OLD_IFS="$IFS" +while read instfile ; do + case "$instfile" in + *.appdata.xml) + echo "metainfo()" + echo "metainfo(${instfile##*/appdata/})" + ;; + *.metainfo.xml) + echo "metainfo()" + echo "metainfo(${instfile##*/metainfo/})" + ;; + esac +done +IFS=$OLD_IFS +