monitor-edid 3.4-1 (x86_64;znver1) 2022-15112
-9999
| Status | rejected | ||||||||
| Submitter | tpgxyz [@T] gmail.com | ||||||||
| Platform | rolling | ||||||||
| Repository | main | ||||||||
| URL | https://abf.openmandriva.org/build_lists/226841 | ||||||||
| Packages |
|
||||||||
| Build Date | 2022-08-16 18:19:40 +0000 UTC | ||||||||
| Last Updated | 2022-08-31 15:03:49.727586162 +0000 UTC |
$ git show --format=fuller --patch-with-stat --summary 112b399d3caed06b78db0366323195fb01acc075
commit 112b399d3caed06b78db0366323195fb01acc075
Author: Tomasz Paweł Gajc <tpgxyz@gmail.com>
AuthorDate: Tue Aug 16 20:02:41 2022 +0200
Commit: Tomasz Paweł Gajc <tpgxyz@gmail.com>
CommitDate: Tue Aug 16 20:02:41 2022 +0200
fix merge usr
---
monitor-edid-3.4-merge-usr.patch | 27 +++++++++++++++++++++++++++
monitor-edid.spec | 2 +-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 monitor-edid-3.4-merge-usr.patch
diff --git a/monitor-edid-3.4-merge-usr.patch b/monitor-edid-3.4-merge-usr.patch
new file mode 100644
index 0000000..f1672d8
--- /dev/null
+++ b/monitor-edid-3.4-merge-usr.patch
@@ -0,0 +1,27 @@
+diff -Naur monitor-edid-3.4/Makefile monitor-edid-3.4.tpg/Makefile
+--- monitor-edid-3.4/Makefile 2021-01-25 22:50:05.000000000 +0000
++++ monitor-edid-3.4.tpg/Makefile 2022-08-16 18:01:05.094274017 +0000
+@@ -19,7 +19,6 @@
+
+ DESTDIR=
+ bindir=/usr/bin
+-sbindir=/usr/sbin
+
+ TARGETS =
+ ifdef HAS_VBE
+@@ -38,13 +37,11 @@
+
+ install: $(TARGETS)
+ install -d $(DESTDIR)$(bindir)
+- install -d $(DESTDIR)$(sbindir)
+- install monitor-edid monitor-probe monitor-probe-using-X $(DESTDIR)$(sbindir)
++ install monitor-edid monitor-probe monitor-probe-using-X $(DESTDIR)$(bindir)
+ ifdef HAS_VBE
+- install monitor-get-edid-using-vbe $(DESTDIR)$(sbindir)
++ install monitor-get-edid-using-vbe $(DESTDIR)$(bindir)
+ endif
+ install monitor-parse-edid $(DESTDIR)$(bindir)
+- ln -sf monitor-edid $(DESTDIR)$(sbindir)/monitor-get-edid
+
+ clean:
+ $(RM) $(TARGETS) *.a *.o *~
diff --git a/monitor-edid.spec b/monitor-edid.spec
index 62303d3..f3acba4 100644
--- a/monitor-edid.spec
+++ b/monitor-edid.spec
@@ -6,6 +6,7 @@ License: GPLv3+
Group: System/Configuration/Other
Url: https://gitweb.mageia.org/software/monitor-edid
Source0: https://gitweb.mageia.org/software/%{name}/snapshot/%{name}-%{version}.tar.xz
+Patch0: monitor-edid-3.4-merge-usr.patch
BuildRequires: libx86-devel
ExclusiveArch: %{ix86} %{x86_64}
@@ -26,4 +27,3 @@ For more information about EDID, see https://en.wikipedia.org/wiki/EDID
%files
%doc README NEWS
%{_bindir}/*
-%optional %{_sbindir}/monitor-*
Not Available
| benbullard79 [@T] cox.net | No Comment. | 815d 14hrs |
| benbullard79 [@T] cox.net | No Comment. | 815d 14hrs |