rpms/monitor-edid/EL-4 monitor-edid-lrmi.patch, NONE, 1.1 monitor-edid-makesource.sh, 1.1, 1.2 monitor-edid.spec, 1.1, 1.2 sources, 1.2, 1.3 monitor-edid-system-lrmi.patch, 1.1, NONE

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/monitor-edid/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31171

Modified Files:
	monitor-edid-makesource.sh monitor-edid.spec sources 
Added Files:
	monitor-edid-lrmi.patch 
Removed Files:
	monitor-edid-system-lrmi.patch 
Log Message:
update to 2.5

monitor-edid-lrmi.patch:
 Makefile |    2 +-
 vbe.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE monitor-edid-lrmi.patch ---
diff -up monitor-edid-2.5/Makefile.lrmi monitor-edid-2.5/Makefile
--- monitor-edid-2.5/Makefile.lrmi	2009-10-25 20:30:10.000000000 +0100
+++ monitor-edid-2.5/Makefile	2009-10-25 20:31:34.000000000 +0100
@@ -30,7 +30,7 @@ CFLAGS = -O -Wall -g
 OBJS = monitor-get-edid-using-vbe.c vbe.o libint10.a libx86emu.a
 
 ifeq (i386,$(ARCH))
-monitor-get-edid-using-vbe: LDFLAGS += -llrmi
+OBJS += lrmi.o
 endif
 
 all: $(TARGETS)
diff -up monitor-edid-2.5/vbe.c.lrmi monitor-edid-2.5/vbe.c
--- monitor-edid-2.5/vbe.c.lrmi	2009-10-25 20:30:04.000000000 +0100
+++ monitor-edid-2.5/vbe.c	2009-10-25 20:31:03.000000000 +0100
@@ -193,7 +193,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)
 {


Index: monitor-edid-makesource.sh
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/EL-4/monitor-edid-makesource.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monitor-edid-makesource.sh	8 Apr 2008 16:07:32 -0000	1.1
+++ monitor-edid-makesource.sh	27 Oct 2009 06:53:45 -0000	1.2
@@ -2,8 +2,8 @@
 
 # check http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/monitor-edid/trunk/
 
-VERSION=1.16
-RELEASE=238912
+VERSION=2.5
+RELEASE=262278
 
 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 && \


Index: monitor-edid.spec
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/EL-4/monitor-edid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monitor-edid.spec	8 Apr 2008 16:07:32 -0000	1.1
+++ monitor-edid.spec	27 Oct 2009 06:53:45 -0000	1.2
@@ -1,24 +1,25 @@
 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:        5%{?dist}
+Version:        2.5
+Release:        1%{?dist}.1
 
 # run monitor-edid-makesource.sh to create
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-makesource.sh
+Source2:        lrmi-0.10.tar.gz
 
-Patch0:         %{name}-system-lrmi.patch
+Patch0:         %{name}-lrmi.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%ifarch %{ix86} 
 %if 0%{?fedora}
+%ifarch %{ix86} 
 BuildRequires: lrmi-devel
 %endif
 %endif
@@ -32,15 +33,13 @@ For more information about EDID, see htt
 %prep
 %setup -q
 
-%if 0%{?fedora}
-# use system LRMI
-%patch0 -p1
-rm -f lrmi.c lrmi.h
+%if 0%{?rhel}
+tar xzf %{SOURCE2}
+cp lrmi-0.10/lrmi.{c,h} .
+cp lrmi-0.10/README README.lrmi
+%patch0 -p1 -b .lrmi
 %endif
 
-cp x86emu/LICENSE LICENSE.x86emu
-
-
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
 
@@ -57,12 +56,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS COPYING LICENSE.x86emu
+%doc README NEWS COPYING
+%if 0%{?rhel}
+%doc README.lrmi
+%endif
 %{_bindir}/*
 %{_sbindir}/*
 
 
 %changelog
+* Tue Oct 27 2009 Remi Collet <Fedora at famillecollet.com> 2.5-1.1
+- remove BR lrmi-devel on EL
+
+* Sun Oct 25 2009 Remi Collet <Fedora at famillecollet.com> 2.5-1
+- new version
+- bundle lrmi (not available on EL)
+
 * Mon Apr 07 2008 Remi Collet <Fedora at famillecollet.com> 1.16-5
 - lrmi not available on EL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Apr 2008 16:06:29 -0000	1.2
+++ sources	27 Oct 2009 06:53:45 -0000	1.3
@@ -1 +1,2 @@
-d90a9c03efd3bf2741ead193c95ef0e1  monitor-edid-1.16.tar.bz2
+17bd967d77397986b368fa28c6ec9153  monitor-edid-2.5.tar.bz2
+fc1d9495e8f4563fca471bb65f34a5da  lrmi-0.10.tar.gz


--- monitor-edid-system-lrmi.patch DELETED ---