rpms/monitor-edid/devel monitor-edid-lrmi.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 monitor-edid-makesource.sh, 1.2, 1.3 monitor-edid.spec, 1.5, 1.6 sources, 1.4, 1.5

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/monitor-edid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21346

Modified Files:
	.cvsignore monitor-edid-makesource.sh monitor-edid.spec 
	sources 
Added Files:
	monitor-edid-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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Oct 2009 16:36:01 -0000	1.4
+++ .cvsignore	27 Oct 2009 06:20:46 -0000	1.5
@@ -1 +1,2 @@
-monitor-edid-2.4.tar.bz2
+monitor-edid-2.5.tar.bz2
+lrmi-0.10.tar.gz


Index: monitor-edid-makesource.sh
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/devel/monitor-edid-makesource.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- monitor-edid-makesource.sh	10 Apr 2008 16:52:32 -0000	1.2
+++ monitor-edid-makesource.sh	27 Oct 2009 06:20:47 -0000	1.3
@@ -2,8 +2,8 @@
 
 # check http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/monitor-edid/trunk/
 
-VERSION=2.0
-RELEASE=242031
+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/devel/monitor-edid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- monitor-edid.spec	17 Oct 2009 16:36:02 -0000	1.5
+++ monitor-edid.spec	27 Oct 2009 06:20:47 -0000	1.6
@@ -6,13 +6,15 @@ License:        GPLv3+ and BSD
 Group:          System Environment/Base
 Url:            http://wiki.mandriva.com/en/Tools/monitor-edid
 
-Version:        2.4
+Version:        2.5
 Release:        1%{?dist}
 
 # run monitor-edid-makesource.sh to create
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-makesource.sh
+Source2:        lrmi-0.10.tar.gz
 
+Patch0:         %{name}-lrmi.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,6 +31,12 @@ For more information about EDID, see htt
 %prep
 %setup -q
 
+%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
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -47,11 +55,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README NEWS COPYING
+%if 0%{?rhel}
+%doc README.lrmi
+%endif
 %{_bindir}/*
 %{_sbindir}/*
 
 
 %changelog
+* Sun Oct 25 2009 Remi Collet <Fedora at famillecollet.com> 2.5-1
+- new version
+- bundle lrmi (not available on EL)
+
 * Sat Oct 17 2009 Remi Collet <Fedora at famillecollet.com> 2.4-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Oct 2009 16:36:02 -0000	1.4
+++ sources	27 Oct 2009 06:20:47 -0000	1.5
@@ -1 +1,2 @@
-aad83368248b58736c3699cc7d9caaf1  monitor-edid-2.4.tar.bz2
+17bd967d77397986b368fa28c6ec9153  monitor-edid-2.5.tar.bz2
+fc1d9495e8f4563fca471bb65f34a5da  lrmi-0.10.tar.gz