From a9e7ac5384fc172bfd61afa1084faea838ebd89765730acf8c5c9f17c6901664 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 15 Dec 2011 12:49:44 +0000 Subject: [PATCH] - readd desktop.attr again, moving back from update-desktop-file OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=165 --- fileattrs.diff | 74 ++++++++++++++++++++++++++++++------------------- rpm-python.spec | 1 - rpm.changes | 5 ++++ rpm.spec | 1 - 4 files changed, 50 insertions(+), 31 deletions(-) diff --git a/fileattrs.diff b/fileattrs.diff index 9ee1f62..35f2335 100644 --- a/fileattrs.diff +++ b/fileattrs.diff @@ -1,23 +1,14 @@ ---- ./fileattrs/Makefile.am.orig 2011-07-12 11:28:13.000000000 +0000 -+++ ./fileattrs/Makefile.am 2011-07-18 17:29:11.000000000 +0000 -@@ -5,7 +5,8 @@ include $(top_srcdir)/rpm.am - fattrsdir = $(rpmconfigdir)/fileattrs - - fattrs_DATA = \ -- desktop.attr elf.attr font.attr libtool.attr perl.attr perllib.attr \ -- pkgconfig.attr python.attr ocaml.attr script.attr mono.attr -+ elf.attr font.attr libtool.attr perl.attr perllib.attr \ -+ pkgconfig.attr python.attr ocaml.attr script.attr mono.attr \ -+ debuginfo.attr elflib.attr firmware.attr ksyms.attr sysvinit.attr - - EXTRA_DIST = $(fattrs_DATA) ---- ./fileattrs/debuginfo.attr.orig 2011-07-18 17:29:11.000000000 +0000 -+++ ./fileattrs/debuginfo.attr 2011-07-18 17:29:11.000000000 +0000 +Index: fileattrs/debuginfo.attr +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ fileattrs/debuginfo.attr 2011-12-15 13:47:26.745458876 +0100 @@ -0,0 +1,2 @@ +%__debuginfo_provides %{_rpmconfigdir}/debuginfo.prov +%__debuginfo_path ^/usr/lib/debug/ ---- ./fileattrs/elf.attr.orig 2011-07-15 09:32:41.000000000 +0000 -+++ ./fileattrs/elf.attr 2011-07-18 17:31:52.000000000 +0000 +Index: fileattrs/elf.attr +=================================================================== +--- fileattrs/elf.attr.orig 2011-07-15 11:32:41.000000000 +0200 ++++ fileattrs/elf.attr 2011-12-15 13:47:26.786456954 +0100 @@ -1,4 +1,5 @@ %__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private} %__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private} @@ -25,43 +16,68 @@ +%__elf_magic ^(setuid )?(setgid )?(sticky )?ELF (32|64)-bit.*executable %__elf_flags exeonly +%__elf_exclude_path ^/usr/lib/debug/ ---- ./fileattrs/elflib.attr.orig 2011-07-18 17:29:11.000000000 +0000 -+++ ./fileattrs/elflib.attr 2011-07-18 17:32:28.000000000 +0000 +Index: fileattrs/elflib.attr +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ fileattrs/elflib.attr 2011-12-15 13:47:26.786456954 +0100 @@ -0,0 +1,4 @@ +%__elflib_provides %{_rpmconfigdir}/elfdeps --assume-exec --provides %{?__filter_GLIBC_PRIVATE:--filter-private} +%__elflib_requires %{_rpmconfigdir}/elfdeps --assume-exec --requires %{?__filter_GLIBC_PRIVATE:--filter-private} +%__elflib_magic ^(setuid )?(setgid )?(sticky )?ELF (32|64)-bit.*shared object +%__elflib_exclude_path ^/usr/lib/debug/ ---- ./fileattrs/firmware.attr.orig 2011-07-18 17:29:11.000000000 +0000 -+++ ./fileattrs/firmware.attr 2011-07-18 17:29:11.000000000 +0000 +Index: fileattrs/firmware.attr +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ fileattrs/firmware.attr 2011-12-15 13:47:26.787456907 +0100 @@ -0,0 +1,2 @@ +%__firmware_provides %{_rpmconfigdir}/firmware.prov +%__firmware_path /lib/firmware/ ---- ./fileattrs/ksyms.attr.orig 2011-07-18 17:29:11.000000000 +0000 -+++ ./fileattrs/ksyms.attr 2011-07-18 17:29:11.000000000 +0000 +Index: fileattrs/ksyms.attr +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ fileattrs/ksyms.attr 2011-12-15 13:47:26.787456907 +0100 @@ -0,0 +1,4 @@ +%__ksyms_provides %{_rpmconfigdir}/find-provides.ksyms %name +%__ksyms_requires %{_rpmconfigdir}/find-requires.ksyms %name +%__ksyms_supplements %{_rpmconfigdir}/find-supplements.ksyms %name +%__ksyms_path (/lib/modules/.*\.ko(\.gz)?)|(/boot/vmlinu[xz].*)$ ---- ./fileattrs/perl.attr.orig 2011-07-12 11:28:13.000000000 +0000 -+++ ./fileattrs/perl.attr 2011-07-18 17:29:11.000000000 +0000 +Index: fileattrs/Makefile.am +=================================================================== +--- fileattrs/Makefile.am.orig 2011-07-12 13:28:13.000000000 +0200 ++++ fileattrs/Makefile.am 2011-12-15 13:47:42.690700975 +0100 +@@ -6,6 +6,7 @@ fattrsdir = $(rpmconfigdir)/fileattrs + + fattrs_DATA = \ + desktop.attr elf.attr font.attr libtool.attr perl.attr perllib.attr \ +- pkgconfig.attr python.attr ocaml.attr script.attr mono.attr ++ pkgconfig.attr python.attr ocaml.attr script.attr mono.attr \ ++ debuginfo.attr elflib.attr firmware.attr ksyms.attr sysvinit.attr + + EXTRA_DIST = $(fattrs_DATA) +Index: fileattrs/perl.attr +=================================================================== +--- fileattrs/perl.attr.orig 2011-07-12 13:28:13.000000000 +0200 ++++ fileattrs/perl.attr 2011-12-15 13:47:26.788456860 +0100 @@ -1,3 +1,4 @@ -%__perl_requires %{_rpmconfigdir}/perl.req +# disabled for now +#%__perl_requires %{_rpmconfigdir}/perl.req %__perl_magic ^.*perl .*$ %__perl_flags exeonly ---- ./fileattrs/perllib.attr.orig 2011-07-12 11:28:13.000000000 +0000 -+++ ./fileattrs/perllib.attr 2011-07-18 17:29:11.000000000 +0000 +Index: fileattrs/perllib.attr +=================================================================== +--- fileattrs/perllib.attr.orig 2011-07-12 13:28:13.000000000 +0200 ++++ fileattrs/perllib.attr 2011-12-15 13:47:26.915450823 +0100 @@ -1,3 +1,4 @@ %__perllib_provides %{_rpmconfigdir}/perl.prov -%__perllib_requires %{_rpmconfigdir}/perl.req +#disabled for now +#%__perllib_requires %{_rpmconfigdir}/perl.req %__perllib_magic ^Perl[[:digit:]] module source.* ---- ./fileattrs/sysvinit.attr.orig 2011-07-18 17:29:11.000000000 +0000 -+++ ./fileattrs/sysvinit.attr 2011-07-18 17:29:11.000000000 +0000 +Index: fileattrs/sysvinit.attr +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ fileattrs/sysvinit.attr 2011-12-15 13:47:26.915450823 +0100 @@ -0,0 +1,2 @@ +%__sysvinit_provides %{_rpmconfigdir}/sysvinitdeps.sh --provides +%__sysvinit_path ^/etc/init\.d/ diff --git a/rpm-python.spec b/rpm-python.spec index 26cee30..961cad7 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: rpm-python BuildRequires: file-devel BuildRequires: libacl-devel diff --git a/rpm.changes b/rpm.changes index 8275a6e..11e5893 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 15 12:48:24 UTC 2011 - coolo@suse.com + +- readd desktop.attr again, moving back from update-desktop-file + ------------------------------------------------------------------- Mon Dec 12 11:02:10 UTC 2011 - coolo@suse.com diff --git a/rpm.spec b/rpm.spec index 70956c9..0d70bf3 100644 --- a/rpm.spec +++ b/rpm.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: rpm BuildRequires: file-devel BuildRequires: libacl-devel