From 67a78d16e224a0c9cc0e76a238bc5f347f38a779 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Apr 10 2008 17:10:28 +0000
Subject: update to 2.0


---

diff --git a/monitor-edid-makesource.sh b/monitor-edid-makesource.sh
index 13f6b4d..d0d955c 100644
--- a/monitor-edid-makesource.sh
+++ b/monitor-edid-makesource.sh
@@ -2,8 +2,8 @@
 
 # check http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/monitor-edid/trunk/
 
-VERSION=1.16
-RELEASE=238912
+VERSION=2.0
+RELEASE=242031
 
 svn export -r $RELEASE http://svn.mandriva.com/svn/soft/monitor-edid/trunk monitor-edid-$VERSION && \
   tar cjf monitor-edid-$VERSION.tar.bz2 monitor-edid-$VERSION && \
diff --git a/monitor-edid-system-lrmi.patch b/monitor-edid-system-lrmi.patch
deleted file mode 100644
index c0db436..0000000
--- a/monitor-edid-system-lrmi.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up monitor-edid-1.16/vbe.c~ monitor-edid-1.16/vbe.c
---- monitor-edid-1.16/vbe.c~	2008-01-08 20:14:54.000000000 +0200
-+++ monitor-edid-1.16/vbe.c	2008-04-05 23:54:59.000000000 +0300
-@@ -157,7 +157,7 @@ int vbe_get_edid_info(hd_data_t *hd_data
- }
- 
- #ifdef LRMI
--#include "lrmi.h"
-+#include <lrmi.h>
- 
- static int vbe_check_vbe_info__old(void)
- {
-diff -up monitor-edid-1.16/Makefile~ monitor-edid-1.16/Makefile
---- monitor-edid-1.16/Makefile~	2008-03-10 09:53:34.000000000 +0200
-+++ monitor-edid-1.16/Makefile	2008-04-05 23:54:39.000000000 +0300
-@@ -30,7 +30,7 @@ CFLAGS = -O -Wall -g
- OBJS = monitor-get-edid-using-vbe.c vbe.o libint10.a libx86emu.a
- 
- ifeq (i386,$(ARCH))
--OBJS += lrmi.o
-+monitor-get-edid-using-vbe: LDFLAGS += -llrmi
- endif
- 
- all: $(TARGETS)
diff --git a/monitor-edid.spec b/monitor-edid.spec
index 7ab7904..a71eb06 100644
--- a/monitor-edid.spec
+++ b/monitor-edid.spec
@@ -1,19 +1,18 @@
 Name:           monitor-edid
 Summary:        Tool for probing and parsing monitor EDID
 
-# monitor-edid is LGPL, lrmi is MIT, cvt & x86emu are BSD
-License:        LGPLv2+ and BSD
+# monitor-edid is GPLv3+, x86emu is BSD
+License:        GPLv3+ and BSD
 Group:          System Environment/Base
 Url:            http://wiki.mandriva.com/en/Tools/monitor-edid
 
-Version:        1.16
-Release:        4%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 
 # run monitor-edid-makesource.sh to create
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-makesource.sh
 
-Patch0:         %{name}-system-lrmi.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,10 +29,6 @@ For more information about EDID, see http://en.wikipedia.org/wiki/EDID
 %prep
 %setup -q
 
-# use system LRMI
-%patch0 -p1
-rm -f lrmi.c lrmi.h
-
 cp x86emu/LICENSE LICENSE.x86emu
 
 
@@ -59,6 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 08 2008 Remi Collet <Fedora@famillecollet.com> 2.0-1
+- new version
+
+* Mon Apr 07 2008 Remi Collet <Fedora@famillecollet.com> 1.16-5
+- lrmi not available on EL
+
 * Sun Apr 06 2008 Remi Collet <Fedora@famillecollet.com> 1.16-4
 - use system lrmi on ix86 (From Ville Skyttä)
 
diff --git a/sources b/sources
index b4566fb..99de9a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d90a9c03efd3bf2741ead193c95ef0e1  monitor-edid-1.16.tar.bz2
+78b62449b1efdf0f4939615cb49ff35f  monitor-edid-2.0.tar.bz2