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

Accepting request 70699 from Base:System

Browse Source 
->

OBS-URL: https://build.opensuse.org/request/show/70699
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=132
This commit is contained in:
Berthold Gunreben 2011-05-19 14:04:20 +00:00 committed by Git OBS Bridge
commit 4794601da2
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fileattrs.diff
View File

@ -1,12 +1,12 @@
--- ./fileattrs/Makefile.am.orig 2011-05-18 09:27:44.000000000 +0000 --- ./fileattrs/Makefile.am.orig 2011-05-18 09:27:44.000000000 +0000
+++ ./fileattrs/Makefile.am 2011-05-19 09:58:19.000000000 +0000 +++ ./fileattrs/Makefile.am 2011-05-19 12:50:54.000000000 +0000
@@ -6,6 +6,7 @@ fattrsdir = $(rpmconfigdir)/fileattrs @@ -6,6 +6,7 @@ fattrsdir = $(rpmconfigdir)/fileattrs
fattrs_DATA = \ fattrs_DATA = \
desktop.attr elf.attr font.attr libtool.attr perl.attr perllib.attr \ 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
+ 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 gstreamer.attr ksyms.attr sysvinit.attr + debuginfo.attr elflib.attr firmware.attr ksyms.attr sysvinit.attr
EXTRA_DIST = $(fattrs_DATA) EXTRA_DIST = $(fattrs_DATA)
--- ./fileattrs/debuginfo.attr.orig 2011-05-18 09:27:44.000000000 +0000 --- ./fileattrs/debuginfo.attr.orig 2011-05-18 09:27:44.000000000 +0000
@ -42,13 +42,6 @@
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+%__firmware_provides %{_rpmconfigdir}/firmware.prov +%__firmware_provides %{_rpmconfigdir}/firmware.prov
+%__firmware_path /lib/firmware/ +%__firmware_path /lib/firmware/
--- ./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-18 09:27:44.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 +++ ./fileattrs/ksyms.attr 2011-05-18 09:27:58.000000000 +0000
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@

8
magic_and_path.diff
View File

@ -3,14 +3,6 @@ match both regexpes to be sent to the dependency generator.
--- build/rpmfc.c.orig 2011-05-16 10:46:20.000000000 +0000 --- build/rpmfc.c.orig 2011-05-16 10:46:20.000000000 +0000
+++ build/rpmfc.c 2011-05-16 11:02:56.000000000 +0000 +++ build/rpmfc.c 2011-05-16 11:02:56.000000000 +0000
@@ -613,6 +613,7 @@ static void rpmfcAttributes(rpmfc fc, co
const char *path = fullpath + fc->brlen;
int is_executable = 0;
struct stat st;
+ int magic_and_path;
if (stat(fullpath, &st) == 0) {
is_executable = (S_ISREG(st.st_mode)) &&
(st.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH));
@@ -630,10 +631,13 @@ static void rpmfcAttributes(rpmfc fc, co @@ -630,10 +631,13 @@ static void rpmfcAttributes(rpmfc fc, co
continue; continue;

6
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 19 14:51:13 CEST 2011 - mls@suse.de
- remove gstreamer from fileattrs
- remove unused var from magic_and_path patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 19 11:59:38 CEST 2011 - mls@suse.de Thu May 19 11:59:38 CEST 2011 - mls@suse.de