pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

split elflib from elf fileattrs so that libraries without x-bits are also scanned

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=101
This commit is contained in:
Michael Schröder 2011-05-18 09:35:02 +00:00 committed by Git OBS Bridge
parent 6365ebe782
commit 76502b172f
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
fileattrs.diff
View File

@ -1,8 +1,5 @@
Add needed fileattrs for compatibility. In the future they will
be moved into the corresponding packages.
--- ./fileattrs/Makefile.am.orig 2011-05-13 14:34:47.000000000 +0000
+++ ./fileattrs/Makefile.am 2011-05-13 14:35:28.000000000 +0000
--- ./fileattrs/Makefile.am.orig 2011-05-18 09:27:44.000000000 +0000
+++ ./fileattrs/Makefile.am 2011-05-18 09:27:58.000000000 +0000
@@ -6,6 +6,7 @@ fattrsdir = $(rpmconfigdir)/fileattrs
fattrs_DATA = \
@ -12,47 +9,63 @@ be moved into the corresponding packages.
+ debuginfo.attr firmware.attr gstreamer.attr ksyms.attr sysvinit.attr
EXTRA_DIST = $(fattrs_DATA)
--- ./fileattrs/debuginfo.attr.orig 2011-05-13 14:16:03.000000000 +0000
+++ ./fileattrs/debuginfo.attr 2011-05-13 14:17:13.000000000 +0000
--- ./fileattrs/debuginfo.attr.orig 2011-05-18 09:27:44.000000000 +0000
+++ ./fileattrs/debuginfo.attr 2011-05-18 09:27:58.000000000 +0000
@@ -0,0 +1,2 @@
+%__debuginfo_provides %{_rpmconfigdir}/debuginfo.prov
+%__debuginfo_path ^/usr/lib/debug/
--- ./fileattrs/desktop.attr.orig 2011-05-13 13:59:14.000000000 +0000
+++ ./fileattrs/desktop.attr 2011-05-13 14:07:03.000000000 +0000
--- ./fileattrs/desktop.attr.orig 2011-05-18 09:27:44.000000000 +0000
+++ ./fileattrs/desktop.attr 2011-05-18 09:27:58.000000000 +0000
@@ -1,2 +1,2 @@
-%__desktop_provides %{_rpmconfigdir}/desktop-file.prov
-%__desktop_path ^%{_datadir}/applications/.*\\.desktop$
+%__desktop_provides %{_rpmconfigdir}/mimetypes.prov
+%__desktop_path .*\\.desktop$
--- ./fileattrs/firmware.attr.orig 2011-05-13 14:13:39.000000000 +0000
+++ ./fileattrs/firmware.attr 2011-05-13 14:14:37.000000000 +0000
--- ./fileattrs/elf.attr.orig 2011-05-18 09:28:33.000000000 +0000
+++ ./fileattrs/elf.attr 2011-05-18 09:33:20.000000000 +0000
@@ -1,4 +1,5 @@
%__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private}
%__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private}
-%__elf_magic ^ELF (32|64)-bit.*$
+%__elf_magic ^ELF (32|64)-bit.*executable
%__elf_flags exeonly
+%__elf_exclude_path ^/usr/lib/debug/
--- ./fileattrs/elflib.attr.orig 2011-05-18 09:28:23.000000000 +0000
+++ ./fileattrs/elflib.attr 2011-05-18 09:31:30.000000000 +0000
@@ -0,0 +1,4 @@
+%__elflib_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private}
+%__elflib_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private}
+%__elflib_magic ^ELF (32|64)-bit.*shared object
+%__elflib_exclude_path ^/usr/lib/debug/
--- ./fileattrs/firmware.attr.orig 2011-05-18 09:27:44.000000000 +0000
+++ ./fileattrs/firmware.attr 2011-05-18 09:27:58.000000000 +0000
@@ -0,0 +1,2 @@
+%__firmware_provides %{_rpmconfigdir}/firmware.prov
+%__firmware_path /lib/firmware/
--- ./fileattrs/gstreamer.attr.orig 2011-05-13 14:28:51.000000000 +0000
+++ ./fileattrs/gstreamer.attr 2011-05-13 14:31:59.000000000 +0000
--- ./fileattrs/gstreamer.attr.orig 2011-05-18 09:27:44.000000000 +0000
+++ ./fileattrs/gstreamer.attr 2011-05-18 09:27:58.000000000 +0000
@@ -0,0 +1,4 @@
+%__gstreamer_provides %{_rpmconfigdir}/gstreamer-provides
+%__gstreamer_path libgst
+%__gstreamer_magic ELF.*shared object
+%__gstreamer_flags magic_and_path
--- ./fileattrs/ksyms.attr.orig 2011-05-13 14:20:57.000000000 +0000
+++ ./fileattrs/ksyms.attr 2011-05-13 14:27:04.000000000 +0000
--- ./fileattrs/ksyms.attr.orig 2011-05-18 09:27:44.000000000 +0000
+++ ./fileattrs/ksyms.attr 2011-05-18 09:27:58.000000000 +0000
@@ -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 2010-12-03 12:11:57.000000000 +0000
+++ ./fileattrs/perl.attr 2011-05-13 14:09:31.000000000 +0000
--- ./fileattrs/perl.attr.orig 2011-05-18 09:27:44.000000000 +0000
+++ ./fileattrs/perl.attr 2011-05-18 09:27:58.000000000 +0000
@@ -1,3 +1,4 @@
-%__perl_requires %{_rpmconfigdir}/perl.req
+# disabled for now
+#%__perl_requires %{_rpmconfigdir}/perl.req
%__perl_magic ^.*perl .*$
%__perl_flags exeonly
--- ./fileattrs/sysvinit.attr.orig 2011-05-13 14:32:30.000000000 +0000
+++ ./fileattrs/sysvinit.attr 2011-05-13 14:33:56.000000000 +0000
--- ./fileattrs/sysvinit.attr.orig 2011-05-18 09:27:44.000000000 +0000
+++ ./fileattrs/sysvinit.attr 2011-05-18 09:27:58.000000000 +0000
@@ -0,0 +1,2 @@
+%__sysvinit_provides %{_rpmconfigdir}/sysvinitdeps.sh --provides
+%__sysvinit_path ^/etc/init\.d/

6
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 18 11:34:17 CEST 2011 - mls@suse.de
- split elflib from elf fileattrs so that libraries without
x-bits are also scanned
-------------------------------------------------------------------
Tue May 17 10:47:00 CEST 2011 - mls@suse.de