- move desktop.attr to update-desktop-files
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=123
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
73ff3a8df3
commit
34b8c2b971
@ -1,28 +1,14 @@
|
||||
--- ./fileattrs/Makefile.am.orig 2011-05-18 09:27:44.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 ksyms.attr sysvinit.attr
|
||||
|
||||
EXTRA_DIST = $(fattrs_DATA)
|
||||
--- ./fileattrs/debuginfo.attr.orig 2011-05-18 09:27:44.000000000 +0000
|
||||
+++ ./fileattrs/debuginfo.attr 2011-05-18 09:27:58.000000000 +0000
|
||||
Index: fileattrs/debuginfo.attr
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ fileattrs/debuginfo.attr 2011-06-06 16:16:00.853820498 +0200
|
||||
@@ -0,0 +1,2 @@
|
||||
+%__debuginfo_provides %{_rpmconfigdir}/debuginfo.prov
|
||||
+%__debuginfo_path ^/usr/lib/debug/
|
||||
--- ./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/elf.attr.orig 2011-05-18 09:28:33.000000000 +0000
|
||||
+++ ./fileattrs/elf.attr 2011-05-18 09:33:20.000000000 +0000
|
||||
Index: fileattrs/elf.attr
|
||||
===================================================================
|
||||
--- fileattrs/elf.attr.orig 2011-06-06 16:15:01.591403879 +0200
|
||||
+++ fileattrs/elf.attr 2011-06-06 16:16:00.853820498 +0200
|
||||
@@ -1,4 +1,5 @@
|
||||
%__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private}
|
||||
%__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private}
|
||||
@ -30,43 +16,70 @@
|
||||
+%__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
|
||||
Index: fileattrs/elflib.attr
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ fileattrs/elflib.attr 2011-06-06 16:16:00.854820404 +0200
|
||||
@@ -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 ^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
|
||||
Index: fileattrs/firmware.attr
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ fileattrs/firmware.attr 2011-06-06 16:16:00.854820404 +0200
|
||||
@@ -0,0 +1,2 @@
|
||||
+%__firmware_provides %{_rpmconfigdir}/firmware.prov
|
||||
+%__firmware_path /lib/firmware/
|
||||
--- ./fileattrs/ksyms.attr.orig 2011-05-18 09:27:44.000000000 +0000
|
||||
+++ ./fileattrs/ksyms.attr 2011-05-18 09:27:58.000000000 +0000
|
||||
Index: fileattrs/ksyms.attr
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ fileattrs/ksyms.attr 2011-06-06 16:16:00.854820404 +0200
|
||||
@@ -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-05-18 09:27:44.000000000 +0000
|
||||
+++ ./fileattrs/perl.attr 2011-05-18 09:27:58.000000000 +0000
|
||||
Index: fileattrs/Makefile.am
|
||||
===================================================================
|
||||
--- fileattrs/Makefile.am.orig 2011-06-06 16:15:01.590403974 +0200
|
||||
+++ fileattrs/Makefile.am 2011-06-06 16:16:08.852066946 +0200
|
||||
@@ -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)
|
||||
Index: fileattrs/perl.attr
|
||||
===================================================================
|
||||
--- fileattrs/perl.attr.orig 2011-06-06 16:15:01.591403879 +0200
|
||||
+++ fileattrs/perl.attr 2011-06-06 16:16:00.855820310 +0200
|
||||
@@ -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-05-19 09:59:05.000000000 +0000
|
||||
+++ ./fileattrs/perllib.attr 2011-05-19 09:58:29.000000000 +0000
|
||||
Index: fileattrs/perllib.attr
|
||||
===================================================================
|
||||
--- fileattrs/perllib.attr.orig 2011-06-06 16:15:01.591403879 +0200
|
||||
+++ fileattrs/perllib.attr 2011-06-06 16:16:00.855820310 +0200
|
||||
@@ -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-05-18 09:27:44.000000000 +0000
|
||||
+++ ./fileattrs/sysvinit.attr 2011-05-18 09:27:58.000000000 +0000
|
||||
Index: fileattrs/sysvinit.attr
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ fileattrs/sysvinit.attr 2011-06-06 16:16:00.856820216 +0200
|
||||
@@ -0,0 +1,2 @@
|
||||
+%__sysvinit_provides %{_rpmconfigdir}/sysvinitdeps.sh --provides
|
||||
+%__sysvinit_path ^/etc/init\.d/
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
Index: autodeps/linux.prov
|
||||
===================================================================
|
||||
--- autodeps/linux.prov.orig
|
||||
+++ autodeps/linux.prov
|
||||
@@ -11,6 +11,7 @@ solist=($(printf "%s\n" "${filelist[@]}"
|
||||
pythonlist=
|
||||
tcllist=
|
||||
monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
|
||||
+mimetypelist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(desktop)\$"))
|
||||
|
||||
#
|
||||
# --- Alpha does not mark 64bit dependencies
|
||||
@@ -59,6 +60,11 @@ done | sort -u
|
||||
printf "%s\n" "${tcllist[@]}" | /usr/lib/rpm/tcl.prov | sort -u
|
||||
|
||||
#
|
||||
+# --- mimetypes in .desktop files
|
||||
+[ -x /usr/lib/rpm/mimetypes.prov -a -n "$mimetypelist" ] &&
|
||||
+ printf "%s\n" "${mimetypelist[@]}" | /usr/lib/rpm/mimetypes.prov | sort -u
|
||||
+
|
||||
+#
|
||||
# --- Mono exes/dlls
|
||||
: ${MONO_PREFIX=/usr}
|
||||
if [ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] ; then
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 6 14:16:49 UTC 2011 - coolo@novell.com
|
||||
|
||||
- move desktop.attr to update-desktop-files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 6 13:30:05 CEST 2011 - mls@suse.de
|
||||
|
||||
|
||||
3
rpm.spec
3
rpm.spec
@ -83,7 +83,6 @@ Patch45: debugsource-package.diff
|
||||
Patch46: whatrequires-doc.diff
|
||||
Patch47: remove-brp-strips.diff
|
||||
Patch48: requires-ge-macro.diff
|
||||
Patch49: mimetype.diff
|
||||
Patch50: debugedit-canon-fix.diff
|
||||
Patch51: finddebuginfo-absolute-links.diff
|
||||
Patch52: firmware.diff
|
||||
@ -178,7 +177,7 @@ rm -f rpmdb/db.h
|
||||
%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
|
||||
%patch -P 20 -P 21 -P 22 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
|
||||
%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
|
||||
%patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
|
||||
%patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48
|
||||
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
|
||||
%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
|
||||
%patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
|
||||
|
||||
Loading…
Reference in New Issue
Block a user