From 2d57a3fa3cb74bad8620dc22c47b35c47704d3b666fe565e5d5e184f2ea49686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 19 May 2011 13:15:53 +0000 Subject: [PATCH] remove gstreamer from fileattrs, remove unused var from magic_and_path patch OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=111 --- fileattrs.diff | 11 ++--------- magic_and_path.diff | 8 -------- rpm.changes | 6 ++++++ 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/fileattrs.diff b/fileattrs.diff index e50ddaf..914a75d 100644 --- a/fileattrs.diff +++ b/fileattrs.diff @@ -1,12 +1,12 @@ --- ./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 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 gstreamer.attr ksyms.attr sysvinit.attr ++ debuginfo.attr elflib.attr firmware.attr ksyms.attr sysvinit.attr EXTRA_DIST = $(fattrs_DATA) --- ./fileattrs/debuginfo.attr.orig 2011-05-18 09:27:44.000000000 +0000 @@ -42,13 +42,6 @@ @@ -0,0 +1,2 @@ +%__firmware_provides %{_rpmconfigdir}/firmware.prov +%__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 2011-05-18 09:27:58.000000000 +0000 @@ -0,0 +1,4 @@ diff --git a/magic_and_path.diff b/magic_and_path.diff index 8b3f5f2..de74ea7 100644 --- a/magic_and_path.diff +++ b/magic_and_path.diff @@ -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 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 continue; diff --git a/rpm.changes b/rpm.changes index d493d81..b507303 100644 --- a/rpm.changes +++ b/rpm.changes @@ -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